mirror of
https://github.com/IoTManagerProject/IoTManager.git
synced 2026-03-26 22:22:16 +03:00
33
lib/EspSoftwareSerial/.gitignore
vendored
Normal file
33
lib/EspSoftwareSerial/.gitignore
vendored
Normal file
@@ -0,0 +1,33 @@
|
||||
|
||||
#Ignore thumbnails created by Windows
|
||||
Thumbs.db
|
||||
#Ignore files built by Visual Studio
|
||||
*.obj
|
||||
*.exe
|
||||
*.pdb
|
||||
*.user
|
||||
*.aps
|
||||
*.pch
|
||||
*.vspscc
|
||||
*_i.c
|
||||
*_p.c
|
||||
*.ncb
|
||||
*.suo
|
||||
*.tlb
|
||||
*.tlh
|
||||
*.bak
|
||||
*.cache
|
||||
*.ilk
|
||||
*.log
|
||||
[Bb]in
|
||||
[Dd]ebug*/
|
||||
*.lib
|
||||
*.sbr
|
||||
obj/
|
||||
[Rr]elease*/
|
||||
_ReSharper*/
|
||||
[Tt]est[Rr]esult*
|
||||
.vs/
|
||||
#Nuget packages folder
|
||||
packages/
|
||||
__vm/
|
||||
1
lib/EspSoftwareSerial/.piopm
Normal file
1
lib/EspSoftwareSerial/.piopm
Normal file
@@ -0,0 +1 @@
|
||||
{"type": "library", "name": "EspSoftwareSerial", "version": "8.1.0", "spec": {"owner": "plerup", "id": 168, "name": "EspSoftwareSerial", "requirements": null, "uri": null}}
|
||||
502
lib/EspSoftwareSerial/LICENSE
Normal file
502
lib/EspSoftwareSerial/LICENSE
Normal file
@@ -0,0 +1,502 @@
|
||||
GNU LESSER GENERAL PUBLIC LICENSE
|
||||
Version 2.1, February 1999
|
||||
|
||||
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
[This is the first released version of the Lesser GPL. It also counts
|
||||
as the successor of the GNU Library Public License, version 2, hence
|
||||
the version number 2.1.]
|
||||
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
Licenses are intended to guarantee your freedom to share and change
|
||||
free software--to make sure the software is free for all its users.
|
||||
|
||||
This license, the Lesser General Public License, applies to some
|
||||
specially designated software packages--typically libraries--of the
|
||||
Free Software Foundation and other authors who decide to use it. You
|
||||
can use it too, but we suggest you first think carefully about whether
|
||||
this license or the ordinary General Public License is the better
|
||||
strategy to use in any particular case, based on the explanations below.
|
||||
|
||||
When we speak of free software, we are referring to freedom of use,
|
||||
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 this service if you wish); that you receive source code or can get
|
||||
it if you want it; that you can change the software and use pieces of
|
||||
it in new free programs; and that you are informed that you can do
|
||||
these things.
|
||||
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
distributors to deny you these rights or to ask you to surrender these
|
||||
rights. These restrictions translate to certain responsibilities for
|
||||
you if you distribute copies of the library or if you modify it.
|
||||
|
||||
For example, if you distribute copies of the library, whether gratis
|
||||
or for a fee, you must give the recipients all the rights that we gave
|
||||
you. You must make sure that they, too, receive or can get the source
|
||||
code. If you link other code with the library, you must provide
|
||||
complete object files to the recipients, so that they can relink them
|
||||
with the library after making changes to the library and recompiling
|
||||
it. And you must show them these terms so they know their rights.
|
||||
|
||||
We protect your rights with a two-step method: (1) we copyright the
|
||||
library, and (2) we offer you this license, which gives you legal
|
||||
permission to copy, distribute and/or modify the library.
|
||||
|
||||
To protect each distributor, we want to make it very clear that
|
||||
there is no warranty for the free library. Also, if the library is
|
||||
modified by someone else and passed on, the recipients should know
|
||||
that what they have is not the original version, so that the original
|
||||
author's reputation will not be affected by problems that might be
|
||||
introduced by others.
|
||||
|
||||
Finally, software patents pose a constant threat to the existence of
|
||||
any free program. We wish to make sure that a company cannot
|
||||
effectively restrict the users of a free program by obtaining a
|
||||
restrictive license from a patent holder. Therefore, we insist that
|
||||
any patent license obtained for a version of the library must be
|
||||
consistent with the full freedom of use specified in this license.
|
||||
|
||||
Most GNU software, including some libraries, is covered by the
|
||||
ordinary GNU General Public License. This license, the GNU Lesser
|
||||
General Public License, applies to certain designated libraries, and
|
||||
is quite different from the ordinary General Public License. We use
|
||||
this license for certain libraries in order to permit linking those
|
||||
libraries into non-free programs.
|
||||
|
||||
When a program is linked with a library, whether statically or using
|
||||
a shared library, the combination of the two is legally speaking a
|
||||
combined work, a derivative of the original library. The ordinary
|
||||
General Public License therefore permits such linking only if the
|
||||
entire combination fits its criteria of freedom. The Lesser General
|
||||
Public License permits more lax criteria for linking other code with
|
||||
the library.
|
||||
|
||||
We call this license the "Lesser" General Public License because it
|
||||
does Less to protect the user's freedom than the ordinary General
|
||||
Public License. It also provides other free software developers Less
|
||||
of an advantage over competing non-free programs. These disadvantages
|
||||
are the reason we use the ordinary General Public License for many
|
||||
libraries. However, the Lesser license provides advantages in certain
|
||||
special circumstances.
|
||||
|
||||
For example, on rare occasions, there may be a special need to
|
||||
encourage the widest possible use of a certain library, so that it becomes
|
||||
a de-facto standard. To achieve this, non-free programs must be
|
||||
allowed to use the library. A more frequent case is that a free
|
||||
library does the same job as widely used non-free libraries. In this
|
||||
case, there is little to gain by limiting the free library to free
|
||||
software only, so we use the Lesser General Public License.
|
||||
|
||||
In other cases, permission to use a particular library in non-free
|
||||
programs enables a greater number of people to use a large body of
|
||||
free software. For example, permission to use the GNU C Library in
|
||||
non-free programs enables many more people to use the whole GNU
|
||||
operating system, as well as its variant, the GNU/Linux operating
|
||||
system.
|
||||
|
||||
Although the Lesser General Public License is Less protective of the
|
||||
users' freedom, it does ensure that the user of a program that is
|
||||
linked with the Library has the freedom and the wherewithal to run
|
||||
that program using a modified version of the Library.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow. Pay close attention to the difference between a
|
||||
"work based on the library" and a "work that uses the library". The
|
||||
former contains code derived from the library, whereas the latter must
|
||||
be combined with the library in order to run.
|
||||
|
||||
GNU LESSER GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License Agreement applies to any software library or other
|
||||
program which contains a notice placed by the copyright holder or
|
||||
other authorized party saying it may be distributed under the terms of
|
||||
this Lesser General Public License (also called "this License").
|
||||
Each licensee is addressed as "you".
|
||||
|
||||
A "library" means a collection of software functions and/or data
|
||||
prepared so as to be conveniently linked with application programs
|
||||
(which use some of those functions and data) to form executables.
|
||||
|
||||
The "Library", below, refers to any such software library or work
|
||||
which has been distributed under these terms. A "work based on the
|
||||
Library" means either the Library or any derivative work under
|
||||
copyright law: that is to say, a work containing the Library or a
|
||||
portion of it, either verbatim or with modifications and/or translated
|
||||
straightforwardly into another language. (Hereinafter, translation is
|
||||
included without limitation in the term "modification".)
|
||||
|
||||
"Source code" for a work means the preferred form of the work for
|
||||
making modifications to it. For a library, complete source code means
|
||||
all the source code for all modules it contains, plus any associated
|
||||
interface definition files, plus the scripts used to control compilation
|
||||
and installation of the library.
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running a program using the Library is not restricted, and output from
|
||||
such a program is covered only if its contents constitute a work based
|
||||
on the Library (independent of the use of the Library in a tool for
|
||||
writing it). Whether that is true depends on what the Library does
|
||||
and what the program that uses the Library does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Library's
|
||||
complete source code as you receive it, in any medium, provided that
|
||||
you conspicuously and appropriately publish on each copy an
|
||||
appropriate copyright notice and disclaimer of warranty; keep intact
|
||||
all the notices that refer to this License and to the absence of any
|
||||
warranty; and distribute a copy of this License along with the
|
||||
Library.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy,
|
||||
and you may at your option offer warranty protection in exchange for a
|
||||
fee.
|
||||
|
||||
2. You may modify your copy or copies of the Library or any portion
|
||||
of it, thus forming a work based on the Library, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) The modified work must itself be a software library.
|
||||
|
||||
b) You must cause the files modified to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
c) You must cause the whole of the work to be licensed at no
|
||||
charge to all third parties under the terms of this License.
|
||||
|
||||
d) If a facility in the modified Library refers to a function or a
|
||||
table of data to be supplied by an application program that uses
|
||||
the facility, other than as an argument passed when the facility
|
||||
is invoked, then you must make a good faith effort to ensure that,
|
||||
in the event an application does not supply such function or
|
||||
table, the facility still operates, and performs whatever part of
|
||||
its purpose remains meaningful.
|
||||
|
||||
(For example, a function in a library to compute square roots has
|
||||
a purpose that is entirely well-defined independent of the
|
||||
application. Therefore, Subsection 2d requires that any
|
||||
application-supplied function or table used by this function must
|
||||
be optional: if the application does not supply it, the square
|
||||
root function must still compute square roots.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Library,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Library, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote
|
||||
it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Library.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Library
|
||||
with the Library (or with a work based on the Library) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may opt to apply the terms of the ordinary GNU General Public
|
||||
License instead of this License to a given copy of the Library. To do
|
||||
this, you must alter all the notices that refer to this License, so
|
||||
that they refer to the ordinary GNU General Public License, version 2,
|
||||
instead of to this License. (If a newer version than version 2 of the
|
||||
ordinary GNU General Public License has appeared, then you can specify
|
||||
that version instead if you wish.) Do not make any other change in
|
||||
these notices.
|
||||
|
||||
Once this change is made in a given copy, it is irreversible for
|
||||
that copy, so the ordinary GNU General Public License applies to all
|
||||
subsequent copies and derivative works made from that copy.
|
||||
|
||||
This option is useful when you wish to copy part of the code of
|
||||
the Library into a program that is not a library.
|
||||
|
||||
4. You may copy and distribute the Library (or a portion or
|
||||
derivative of it, under Section 2) in object code or executable form
|
||||
under the terms of Sections 1 and 2 above provided that you accompany
|
||||
it with the complete corresponding machine-readable source code, which
|
||||
must be distributed under the terms of Sections 1 and 2 above on a
|
||||
medium customarily used for software interchange.
|
||||
|
||||
If distribution of object code is made by offering access to copy
|
||||
from a designated place, then offering equivalent access to copy the
|
||||
source code from the same place satisfies the requirement to
|
||||
distribute the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
5. A program that contains no derivative of any portion of the
|
||||
Library, but is designed to work with the Library by being compiled or
|
||||
linked with it, is called a "work that uses the Library". Such a
|
||||
work, in isolation, is not a derivative work of the Library, and
|
||||
therefore falls outside the scope of this License.
|
||||
|
||||
However, linking a "work that uses the Library" with the Library
|
||||
creates an executable that is a derivative of the Library (because it
|
||||
contains portions of the Library), rather than a "work that uses the
|
||||
library". The executable is therefore covered by this License.
|
||||
Section 6 states terms for distribution of such executables.
|
||||
|
||||
When a "work that uses the Library" uses material from a header file
|
||||
that is part of the Library, the object code for the work may be a
|
||||
derivative work of the Library even though the source code is not.
|
||||
Whether this is true is especially significant if the work can be
|
||||
linked without the Library, or if the work is itself a library. The
|
||||
threshold for this to be true is not precisely defined by law.
|
||||
|
||||
If such an object file uses only numerical parameters, data
|
||||
structure layouts and accessors, and small macros and small inline
|
||||
functions (ten lines or less in length), then the use of the object
|
||||
file is unrestricted, regardless of whether it is legally a derivative
|
||||
work. (Executables containing this object code plus portions of the
|
||||
Library will still fall under Section 6.)
|
||||
|
||||
Otherwise, if the work is a derivative of the Library, you may
|
||||
distribute the object code for the work under the terms of Section 6.
|
||||
Any executables containing that work also fall under Section 6,
|
||||
whether or not they are linked directly with the Library itself.
|
||||
|
||||
6. As an exception to the Sections above, you may also combine or
|
||||
link a "work that uses the Library" with the Library to produce a
|
||||
work containing portions of the Library, and distribute that work
|
||||
under terms of your choice, provided that the terms permit
|
||||
modification of the work for the customer's own use and reverse
|
||||
engineering for debugging such modifications.
|
||||
|
||||
You must give prominent notice with each copy of the work that the
|
||||
Library is used in it and that the Library and its use are covered by
|
||||
this License. You must supply a copy of this License. If the work
|
||||
during execution displays copyright notices, you must include the
|
||||
copyright notice for the Library among them, as well as a reference
|
||||
directing the user to the copy of this License. Also, you must do one
|
||||
of these things:
|
||||
|
||||
a) Accompany the work with the complete corresponding
|
||||
machine-readable source code for the Library including whatever
|
||||
changes were used in the work (which must be distributed under
|
||||
Sections 1 and 2 above); and, if the work is an executable linked
|
||||
with the Library, with the complete machine-readable "work that
|
||||
uses the Library", as object code and/or source code, so that the
|
||||
user can modify the Library and then relink to produce a modified
|
||||
executable containing the modified Library. (It is understood
|
||||
that the user who changes the contents of definitions files in the
|
||||
Library will not necessarily be able to recompile the application
|
||||
to use the modified definitions.)
|
||||
|
||||
b) Use a suitable shared library mechanism for linking with the
|
||||
Library. A suitable mechanism is one that (1) uses at run time a
|
||||
copy of the library already present on the user's computer system,
|
||||
rather than copying library functions into the executable, and (2)
|
||||
will operate properly with a modified version of the library, if
|
||||
the user installs one, as long as the modified version is
|
||||
interface-compatible with the version that the work was made with.
|
||||
|
||||
c) Accompany the work with a written offer, valid for at
|
||||
least three years, to give the same user the materials
|
||||
specified in Subsection 6a, above, for a charge no more
|
||||
than the cost of performing this distribution.
|
||||
|
||||
d) If distribution of the work is made by offering access to copy
|
||||
from a designated place, offer equivalent access to copy the above
|
||||
specified materials from the same place.
|
||||
|
||||
e) Verify that the user has already received a copy of these
|
||||
materials or that you have already sent this user a copy.
|
||||
|
||||
For an executable, the required form of the "work that uses the
|
||||
Library" must include any data and utility programs needed for
|
||||
reproducing the executable from it. However, as a special exception,
|
||||
the materials to be distributed need not include anything that is
|
||||
normally distributed (in either source or binary form) with the major
|
||||
components (compiler, kernel, and so on) of the operating system on
|
||||
which the executable runs, unless that component itself accompanies
|
||||
the executable.
|
||||
|
||||
It may happen that this requirement contradicts the license
|
||||
restrictions of other proprietary libraries that do not normally
|
||||
accompany the operating system. Such a contradiction means you cannot
|
||||
use both them and the Library together in an executable that you
|
||||
distribute.
|
||||
|
||||
7. 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 not covered by this License, and distribute such a combined
|
||||
library, provided that the separate distribution of the work based on
|
||||
the Library and of the other library facilities is otherwise
|
||||
permitted, and provided that you do these two things:
|
||||
|
||||
a) Accompany the combined library with a copy of the same work
|
||||
based on the Library, uncombined with any other library
|
||||
facilities. This must be distributed under the terms of the
|
||||
Sections above.
|
||||
|
||||
b) Give prominent notice with the combined library of the fact
|
||||
that part of it is a work based on the Library, and explaining
|
||||
where to find the accompanying uncombined form of the same work.
|
||||
|
||||
8. You may not copy, modify, sublicense, link with, or distribute
|
||||
the Library except as expressly provided under this License. Any
|
||||
attempt otherwise to copy, modify, sublicense, link with, or
|
||||
distribute the Library is void, and will automatically terminate your
|
||||
rights under this License. However, parties who have received copies,
|
||||
or rights, from you under this License will not have their licenses
|
||||
terminated so long as such parties remain in full compliance.
|
||||
|
||||
9. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Library or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Library (or any work based on the
|
||||
Library), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Library or works based on it.
|
||||
|
||||
10. Each time you redistribute the Library (or any work based on the
|
||||
Library), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute, link with or modify the Library
|
||||
subject to these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties with
|
||||
this License.
|
||||
|
||||
11. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
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
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Library at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Library by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Library.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under any
|
||||
particular circumstance, the balance of the section is intended to apply,
|
||||
and the section as a whole is intended to apply in other circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
12. If the distribution and/or use of the Library is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Library under this License may add
|
||||
an explicit geographical distribution limitation excluding those countries,
|
||||
so that distribution is permitted only in or among countries not thus
|
||||
excluded. In such case, this License incorporates the limitation as if
|
||||
written in the body of this License.
|
||||
|
||||
13. The Free Software Foundation may publish revised and/or new
|
||||
versions of the 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
|
||||
specifies a version number of this License which applies to it and
|
||||
"any later version", you have the option of following the terms and
|
||||
conditions either of that version or of any later version published by
|
||||
the Free Software Foundation. If the Library does not specify a
|
||||
license version number, you may choose any version ever published by
|
||||
the Free Software Foundation.
|
||||
|
||||
14. If you wish to incorporate parts of the Library into other free
|
||||
programs whose distribution conditions are incompatible with these,
|
||||
write to the author to ask for permission. For software which is
|
||||
copyrighted by the Free Software Foundation, write to the Free
|
||||
Software Foundation; we sometimes make exceptions for this. Our
|
||||
decision will be guided by the two goals of preserving the free status
|
||||
of all derivatives of our free software and of promoting the sharing
|
||||
and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
|
||||
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
|
||||
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
|
||||
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
|
||||
OTHER PARTIES PROVIDE THE LIBRARY "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
|
||||
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
|
||||
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
|
||||
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
|
||||
AND/OR REDISTRIBUTE THE LIBRARY 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
|
||||
LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
|
||||
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
||||
DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Libraries
|
||||
|
||||
If you develop a new library, and you want it to be of the greatest
|
||||
possible use to the public, we recommend making it free software that
|
||||
everyone can redistribute and change. You can do so by permitting
|
||||
redistribution under these terms (or, alternatively, under the terms of the
|
||||
ordinary General Public License).
|
||||
|
||||
To apply these terms, attach the following notices to the library. It is
|
||||
safest to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least the
|
||||
"copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the library's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
This library 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
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the library, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the
|
||||
library `Frob' (a library for tweaking knobs) written by James Random Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1990
|
||||
Ty Coon, President of Vice
|
||||
|
||||
That's all there is to it!
|
||||
171
lib/EspSoftwareSerial/README.md
Normal file
171
lib/EspSoftwareSerial/README.md
Normal file
@@ -0,0 +1,171 @@
|
||||
# EspSoftwareSerial
|
||||
|
||||
## Implementation of the Arduino software serial library for the ESP8266 / ESP32 family
|
||||
|
||||
This fork implements interrupt service routine best practice.
|
||||
In the receive interrupt, instead of blocking for whole bytes
|
||||
at a time - voiding any near-realtime behavior of the CPU - only level
|
||||
change and timestamp are recorded. The more time consuming phase
|
||||
detection and byte assembly are done in the main code.
|
||||
|
||||
Except at high bitrates, depending on other ongoing activity,
|
||||
interrupts in particular, this software serial adapter
|
||||
supports full duplex receive and send. At high bitrates (115200bps)
|
||||
send bit timing can be improved at the expense of blocking concurrent
|
||||
full duplex receives, with the
|
||||
`EspSoftwareSerial::UART::enableIntTx(false)` function call.
|
||||
|
||||
The same functionality is given as the corresponding AVR library but
|
||||
several instances can be active at the same time. Speed up to 115200 baud
|
||||
is supported. Besides a constructor compatible to the AVR SoftwareSerial class,
|
||||
and updated constructor that takes no arguments exists, instead the `begin()`
|
||||
function can handle the pin assignments and logic inversion.
|
||||
It also has optional input buffer capacity arguments for byte buffer and ISR bit buffer.
|
||||
This way, it is a better drop-in replacement for the hardware serial APIs on the ESP MCUs.
|
||||
|
||||
Please note that due to the fact that the ESPs always have other activities
|
||||
ongoing, there will be some inexactness in interrupt timings. This may
|
||||
lead to inevitable, but few, bit errors when having heavy data traffic
|
||||
at high baud rates.
|
||||
|
||||
This library supports ESP8266, ESP32, ESP32-S2 and ESP32-C3 devices.
|
||||
|
||||
## Resource optimization
|
||||
|
||||
The memory footprint can be optimized to just fit the amount of expected
|
||||
incoming asynchronous data.
|
||||
For this, the `EspSoftwareSerial::UART` constructor provides two arguments. First, the
|
||||
octet buffer capacity for assembled received octets can be set. Read calls are
|
||||
satisfied from this buffer, freeing it in return.
|
||||
Second, the signal edge detection buffer of 32bit fields can be resized.
|
||||
One octet may require up to to 10 fields, but fewer may be needed,
|
||||
depending on the bit pattern. Any read or write calls check this buffer
|
||||
to assemble received octets, thus promoting completed octets to the octet
|
||||
buffer, freeing fields in the edge detection buffer.
|
||||
|
||||
Look at the swsertest.ino example. There, on reset, ASCII characters ' ' to 'z'
|
||||
are sent. This happens not as a block write, but in a single write call per
|
||||
character. As the example uses a local loopback wire, every outgoing bit is
|
||||
immediately received back. Therefore, any single write call causes up to
|
||||
10 fields - depending on the exact bit pattern - to be occupied in the signal
|
||||
edge detection buffer. In turn, as explained before, each single write call
|
||||
also causes received bit assembly to be performed, promoting these bits from
|
||||
the signal edge detection buffer to the octet buffer as soon as possible.
|
||||
Explaining by way of contrast, if during a a single write call, perhaps because
|
||||
of using block writing, more than a single octet is received, there will be a
|
||||
need for more than 10 fields in the signal edge detection buffer.
|
||||
The necessary capacity of the octet buffer only depends on the amount of incoming
|
||||
data until the next read call.
|
||||
|
||||
For the swsertest.ino example, this results in the following optimized
|
||||
constructor arguments to spend only the minimum RAM on buffers required:
|
||||
|
||||
The octet buffer capacity (`bufCapacity`) is 95 (93 characters net plus two tolerance).
|
||||
The signal edge detection buffer capacity (`isrBufCapacity`) is 11, as each
|
||||
single octet can have up to 11 bits on the wire,
|
||||
which are immediately received during the write, and each
|
||||
write call causes the signal edge detection to promote the previously sent and
|
||||
received bits to the octet buffer.
|
||||
|
||||
In a more generalized scenario, calculate the bits (use message size in octets
|
||||
times 10) that may be asynchronously received to determine the value for
|
||||
`isrBufCapacity` in the constructor. Also use the number of received octets
|
||||
that must be buffered for reading as the value of `bufCapacity`.
|
||||
The more frequently your code calls write or read functions, the greater the
|
||||
chances are that you can reduce the `isrBufCapacity` footprint without losing data,
|
||||
and each time you call read to fetch from the octet buffer, you reduce the
|
||||
need for space there.
|
||||
|
||||
## EspSoftwareSerial::Config and parity
|
||||
The configuration of the data stream is done via a `EspSoftwareSerial::Config`
|
||||
argument to `begin()`. Word lengths can be set to between 5 and 8 bits, parity
|
||||
can be N(one), O(dd) or E(ven) and 1 or 2 stop bits can be used. The default is
|
||||
`SWSERIAL_8N1` using 8 bits, no parity and 1 stop bit but any combination can
|
||||
be used, e.g. `SWSERIAL_7E2`. If using EVEN or ODD parity, any parity errors
|
||||
can be detected with the `readParity()` and `parityEven()` or `parityOdd()`
|
||||
functions respectively. Note that the result of `readParity()` always applies
|
||||
to the preceding `read()` or `peek()` call, and is undefined if they report
|
||||
no data or an error.
|
||||
|
||||
To allow flexible 9-bit and data/addressing protocols, the additional parity
|
||||
modes MARK and SPACE are also available. Furthermore, the parity mode can be
|
||||
individually set in each call to `write()`.
|
||||
|
||||
This allows a simple implementation of protocols where the parity bit is used to
|
||||
distinguish between data and addresses/commands ("9-bit" protocols). First set
|
||||
up EspSoftwareSerial::UART with parity mode SPACE, e.g. `SWSERIAL_8S1`. This will add a
|
||||
parity bit to every byte sent, setting it to logical zero (SPACE parity).
|
||||
|
||||
To detect incoming bytes with the parity bit set (MARK parity), use the
|
||||
`readParity()` function. To send a byte with the parity bit set, just add
|
||||
`MARK` as the second argument when writing, e.g. `write(ch, SWSERIAL_PARITY_MARK)`.
|
||||
|
||||
## Checking for correct pin selection / configuration
|
||||
In general, most pins on the ESP8266 and ESP32 devices can be used by EspSoftwareSerial,
|
||||
however each device has a number of pins that have special functions or require careful
|
||||
handling to prevent undesirable situations, for example they are connected to the
|
||||
on-board SPI flash memory or they are used to determine boot and programming modes
|
||||
after powerup or brownouts. These pins are not able to be configured by this library.
|
||||
|
||||
The exact list for each device can be found in the
|
||||
[ESP32 data sheet](https://www.espressif.com/sites/default/files/documentation/esp32_datasheet_en.pdf)
|
||||
in sections 2.2 (Pin Descriptions) and 2.4 (Strapping pins). There is a discussion
|
||||
dedicated to the use of GPIO12 in this
|
||||
[note about GPIO12](https://github.com/espressif/esp-idf/tree/release/v3.2/examples/storage/sd_card#note-about-gpio12).
|
||||
Refer to the `isValidPin()`, `isValidRxPin()` and `isValidTxPin()`
|
||||
functions in the `EspSoftwareSerial::GpioCapabilities` class for the GPIO restrictions
|
||||
enforced by this library by default.
|
||||
|
||||
The easiest and safest method is to test the object returned at runtime, to see if
|
||||
it is valid. For example:
|
||||
|
||||
```
|
||||
#include <SoftwareSerial.h>
|
||||
|
||||
#define MYPORT_TX 12
|
||||
#define MYPORT_RX 13
|
||||
|
||||
EspSoftwareSerial::UART myPort;
|
||||
|
||||
[...]
|
||||
|
||||
Serial.begin(115200); // Standard hardware serial port
|
||||
|
||||
myPort.begin(38400, SWSERIAL_8N1, MYPORT_RX, MYPORT_TX, false);
|
||||
if (!myPort) { // If the object did not initialize, then its configuration is invalid
|
||||
Serial.println("Invalid EspSoftwareSerial pin configuration, check config");
|
||||
while (1) { // Don't continue with invalid configuration
|
||||
delay (1000);
|
||||
}
|
||||
}
|
||||
|
||||
[...]
|
||||
```
|
||||
|
||||
## Using and updating EspSoftwareSerial in the esp8266com/esp8266 Arduino build environment
|
||||
|
||||
EspSoftwareSerial is both part of the BSP download for ESP8266 in Arduino,
|
||||
and it is set up as a Git submodule in the esp8266 source tree,
|
||||
specifically in `.../esp8266/libraries/SoftwareSerial` when using a Github
|
||||
repository clone in your Arduino sketchbook hardware directory.
|
||||
This supersedes any version of EspSoftwareSerial installed for instance via
|
||||
the Arduino library manager, it is not required to install EspSoftwareSerial
|
||||
for the ESP8266 separately at all, but doing so has ill effect.
|
||||
|
||||
The responsible maintainer of the esp8266 repository has kindly shared the
|
||||
following command line instructions to use, if one wishes to manually
|
||||
update EspSoftwareSerial to a newer release than pulled in via the ESP8266 Arduino BSP:
|
||||
|
||||
To update esp8266/arduino EspSoftwareSerial submodule to lastest master:
|
||||
|
||||
Clean it (optional):
|
||||
```shell
|
||||
$ rm -rf libraries/SoftwareSerial
|
||||
$ git submodule update --init
|
||||
```
|
||||
Now update it:
|
||||
```shell
|
||||
$ cd libraries/SoftwareSerial
|
||||
$ git checkout master
|
||||
$ git pull
|
||||
```
|
||||
71
lib/EspSoftwareSerial/examples/bitpattern/bitpattern.ino
Normal file
71
lib/EspSoftwareSerial/examples/bitpattern/bitpattern.ino
Normal file
@@ -0,0 +1,71 @@
|
||||
#include "SoftwareSerial.h"
|
||||
|
||||
#ifndef D5
|
||||
#if defined(ESP8266)
|
||||
#define D8 (15)
|
||||
#define D5 (14)
|
||||
#define D7 (13)
|
||||
#define D6 (12)
|
||||
#define RX (3)
|
||||
#define TX (1)
|
||||
#elif defined(ESP32)
|
||||
#define D8 (5)
|
||||
#define D5 (18)
|
||||
#define D7 (23)
|
||||
#define D6 (19)
|
||||
#define RX (3)
|
||||
#define TX (1)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
EspSoftwareSerial::UART swSer;
|
||||
#ifdef ESP8266
|
||||
auto logSer = EspSoftwareSerial::UART(-1, TX);
|
||||
auto hwSer = Serial;
|
||||
#else
|
||||
auto logSer = Serial;
|
||||
auto hwSer = Serial1;
|
||||
#endif
|
||||
|
||||
constexpr uint32_t TESTBPS = 115200;
|
||||
|
||||
void setup() {
|
||||
delay(2000);
|
||||
#ifdef ESP8266
|
||||
hwSer.begin(TESTBPS, ::SERIAL_8N1);
|
||||
hwSer.swap();
|
||||
#else
|
||||
hwSer.begin(TESTBPS, ::SERIAL_8N1, D6, D5);
|
||||
#endif
|
||||
logSer.begin(115200);
|
||||
logSer.println(PSTR("\nOne Wire Half Duplex Bitpattern and Datarate Test"));
|
||||
swSer.begin(TESTBPS, EspSoftwareSerial::SWSERIAL_8N1, D6, D5);
|
||||
swSer.enableIntTx(true);
|
||||
logSer.println(PSTR("Tx on swSer"));
|
||||
}
|
||||
|
||||
uint8_t val = 0xff;
|
||||
|
||||
void loop() {
|
||||
swSer.write((uint8_t)0x00);
|
||||
swSer.write(val);
|
||||
swSer.write(val);
|
||||
auto start = ESP.getCycleCount();
|
||||
int rxCnt = 0;
|
||||
while (ESP.getCycleCount() - start < ESP.getCpuFreqMHz() * 1000000 / 10) {
|
||||
if (hwSer.available()) {
|
||||
auto rxVal = hwSer.read();
|
||||
if ((!rxCnt && rxVal) || (rxCnt && rxVal != val)) {
|
||||
logSer.printf(PSTR("Rx bit error: tx = 0x%02x, rx = 0x%02x\n"), val, rxVal);
|
||||
}
|
||||
++rxCnt;
|
||||
}
|
||||
}
|
||||
if (rxCnt != 3) {
|
||||
logSer.printf(PSTR("Rx cnt error, tx = 0x%02x\n"), val);
|
||||
}
|
||||
++val;
|
||||
if (!val) {
|
||||
logSer.println("Starting over");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
// circular_mp_test.cpp : This file contains the 'main' function. Program execution begins and ends there.
|
||||
//
|
||||
|
||||
#include <iostream>
|
||||
#include <thread>
|
||||
#include <chrono>
|
||||
#include <vector>
|
||||
#include "circular_queue/circular_queue_mp.h"
|
||||
|
||||
struct qitem
|
||||
{
|
||||
// produer id
|
||||
int id;
|
||||
// monotonic increasing value
|
||||
int val = 0;
|
||||
};
|
||||
|
||||
constexpr int TOTALMESSAGESTARGET = 60000000;
|
||||
// reserve one thread as consumer
|
||||
const auto THREADS = std::thread::hardware_concurrency() / 2 - 1;
|
||||
const int MESSAGES = TOTALMESSAGESTARGET / THREADS;
|
||||
circular_queue<std::thread> threads(THREADS);
|
||||
circular_queue_mp<qitem> queue(threads.capacity()* MESSAGES / 10);
|
||||
std::vector<int> checks(threads.capacity());
|
||||
|
||||
int main()
|
||||
{
|
||||
using namespace std::chrono_literals;
|
||||
std::cerr << "Utilizing " << THREADS << " producer threads" << std::endl;
|
||||
for (int i = 0; i < threads.capacity(); ++i)
|
||||
{
|
||||
threads.push(std::thread([i]() {
|
||||
for (int c = 0; c < MESSAGES;)
|
||||
{
|
||||
// simulate some load
|
||||
auto start = std::chrono::system_clock::now();
|
||||
while (std::chrono::system_clock::now() - start < 1us);
|
||||
if (queue.push({ i, c }))
|
||||
{
|
||||
++c;
|
||||
}
|
||||
else
|
||||
{
|
||||
//std::cerr << "queue full" << std::endl;
|
||||
//std::this_thread::sleep_for(10us);
|
||||
}
|
||||
//if (0 == c % 10000) std::this_thread::sleep_for(10us);
|
||||
}
|
||||
}));
|
||||
}
|
||||
for (int o = 0; o < threads.available() * MESSAGES; ++o)
|
||||
{
|
||||
auto now = std::chrono::system_clock::now();
|
||||
while (!queue.available())
|
||||
{
|
||||
auto starvedFor = std::chrono::system_clock::now() - now;
|
||||
if (starvedFor > 20s) std::cerr << "queue starved for > 20s" << std::endl;
|
||||
//std::this_thread::sleep_for(20ms);
|
||||
}
|
||||
auto item = queue.pop();
|
||||
if (checks[item.id] != item.val)
|
||||
{
|
||||
std::cerr << "item mismatch" << std::endl;
|
||||
}
|
||||
checks[item.id] = item.val + 1;
|
||||
if (0 == item.val % 1000) std::this_thread::sleep_for(100us);
|
||||
}
|
||||
while (threads.available())
|
||||
{
|
||||
auto thread = threads.pop();
|
||||
thread.join();
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
279
lib/EspSoftwareSerial/examples/loopback/loopback.ino
Normal file
279
lib/EspSoftwareSerial/examples/loopback/loopback.ino
Normal file
@@ -0,0 +1,279 @@
|
||||
#include <SoftwareSerial.h>
|
||||
|
||||
// On ESP8266:
|
||||
// Local EspSoftwareSerial loopback, connect D5 (rx) and D6 (tx).
|
||||
// For local hardware loopback, connect D5 to D8 (tx), D6 to D7 (rx).
|
||||
// For hardware send/sink, connect D7 (rx) and D8 (tx).
|
||||
// Hint: The logger is run at 9600bps such that enableIntTx(true) can remain unchanged. Blocking
|
||||
// interrupts severely impacts the ability of the EspSoftwareSerial devices to operate concurrently
|
||||
// and/or in duplex mode.
|
||||
// Operating in software serial full duplex mode, runs at 19200bps and few errors (~2.5%).
|
||||
// Operating in software serial half duplex mode (both loopback and repeater),
|
||||
// runs at 57600bps with nearly no errors.
|
||||
// Operating loopback in full duplex, and repeater in half duplex, runs at 38400bps with nearly no errors.
|
||||
// On ESP32:
|
||||
// For EspSoftwareSerial or hardware send/sink, connect D5 (rx) and D6 (tx).
|
||||
// Hardware Serial2 defaults to D4 (rx), D3 (tx).
|
||||
// For local hardware loopback, connect D5 (rx) to D3 (tx), D6 (tx) to D4 (rx).
|
||||
|
||||
#ifndef D5
|
||||
#if defined(ESP8266)
|
||||
#define D8 (15)
|
||||
#define D5 (14)
|
||||
#define D7 (13)
|
||||
#define D6 (12)
|
||||
#define RX (3)
|
||||
#define TX (1)
|
||||
#elif defined(ESP32)
|
||||
#define D8 (5)
|
||||
#define D5 (18)
|
||||
#define D7 (23)
|
||||
#define D6 (19)
|
||||
#define RX (3)
|
||||
#define TX (1)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// Pick only one of HWLOOPBACK, HWSOURCESWSINK, or HWSOURCESINK
|
||||
//#define HWLOOPBACK 1
|
||||
//#define HWSOURCESWSINK 1
|
||||
//#define HWSOURCESINK 1
|
||||
#define HALFDUPLEX 1
|
||||
|
||||
#ifdef ESP32
|
||||
constexpr int IUTBITRATE = 19200;
|
||||
#else
|
||||
constexpr int IUTBITRATE = 19200;
|
||||
#endif
|
||||
|
||||
#if defined(ESP8266)
|
||||
constexpr EspSoftwareSerial::Config swSerialConfig = EspSoftwareSerial::SWSERIAL_8E1;
|
||||
constexpr SerialConfig hwSerialConfig = ::SERIAL_8E1;
|
||||
#elif defined(ESP32)
|
||||
constexpr EspSoftwareSerial::Config swSerialConfig = EspSoftwareSerial::SWSERIAL_8E1;
|
||||
constexpr uint32_t hwSerialConfig = ::SERIAL_8E1;
|
||||
#else
|
||||
constexpr unsigned swSerialConfig = 3;
|
||||
#endif
|
||||
constexpr bool invert = false;
|
||||
|
||||
constexpr int BLOCKSIZE = 16; // use fractions of 256
|
||||
|
||||
unsigned long start;
|
||||
const char effTxTxt[] PROGMEM = "eff. tx: ";
|
||||
const char effRxTxt[] PROGMEM = "eff. rx: ";
|
||||
int txCount;
|
||||
int rxCount;
|
||||
int expected;
|
||||
int rxErrors;
|
||||
int rxParityErrors;
|
||||
constexpr int ReportInterval = IUTBITRATE / 8;
|
||||
|
||||
#if defined(ESP8266)
|
||||
#if defined(HWLOOPBACK) || defined(HWSOURCESWSINK)
|
||||
HardwareSerial& hwSerial(Serial);
|
||||
EspSoftwareSerial::UART serialIUT;
|
||||
EspSoftwareSerial::UART logger;
|
||||
#elif defined(HWSOURCESINK)
|
||||
HardwareSerial& serialIUT(Serial);
|
||||
EspSoftwareSerial::UART logger;
|
||||
#else
|
||||
EspSoftwareSerial::UART serialIUT;
|
||||
HardwareSerial& logger(Serial);
|
||||
#endif
|
||||
#elif defined(ESP32)
|
||||
#if defined(HWLOOPBACK) || defined (HWSOURCESWSINK)
|
||||
HardwareSerial& hwSerial(Serial2);
|
||||
EspSoftwareSerial::UART serialIUT;
|
||||
#elif defined(HWSOURCESINK)
|
||||
HardwareSerial& serialIUT(Serial2);
|
||||
#else
|
||||
EspSoftwareSerial::UART serialIUT;
|
||||
#endif
|
||||
HardwareSerial& logger(Serial);
|
||||
#else
|
||||
EspSoftwareSerial::UART serialIUT(14, 12);
|
||||
HardwareSerial& logger(Serial);
|
||||
#endif
|
||||
|
||||
void setup() {
|
||||
#if defined(ESP8266)
|
||||
#if defined(HWLOOPBACK) || defined(HWSOURCESINK) || defined(HWSOURCESWSINK)
|
||||
Serial.begin(IUTBITRATE, hwSerialConfig, ::SERIAL_FULL, 1, invert);
|
||||
Serial.swap();
|
||||
Serial.setRxBufferSize(2 * BLOCKSIZE);
|
||||
logger.begin(9600, EspSoftwareSerial::SWSERIAL_8N1, -1, TX);
|
||||
#else
|
||||
logger.begin(9600);
|
||||
#endif
|
||||
#if !defined(HWSOURCESINK)
|
||||
serialIUT.begin(IUTBITRATE, swSerialConfig, D5, D6, invert, 2 * BLOCKSIZE);
|
||||
#ifdef HALFDUPLEX
|
||||
serialIUT.enableIntTx(false);
|
||||
#endif
|
||||
#endif
|
||||
#elif defined(ESP32)
|
||||
#if defined(HWLOOPBACK) || defined(HWSOURCESWSINK)
|
||||
Serial2.begin(IUTBITRATE, hwSerialConfig, D4, D3, invert);
|
||||
Serial2.setRxBufferSize(2 * BLOCKSIZE);
|
||||
#elif defined(HWSOURCESINK)
|
||||
serialIUT.begin(IUTBITRATE, hwSerialConfig, D5, D6, invert);
|
||||
serialIUT.setRxBufferSize(2 * BLOCKSIZE);
|
||||
#endif
|
||||
#if !defined(HWSOURCESINK)
|
||||
serialIUT.begin(IUTBITRATE, swSerialConfig, D5, D6, invert, 2 * BLOCKSIZE);
|
||||
#ifdef HALFDUPLEX
|
||||
serialIUT.enableIntTx(false);
|
||||
#endif
|
||||
#endif
|
||||
logger.begin(9600);
|
||||
#else
|
||||
#if !defined(HWSOURCESINK)
|
||||
serialIUT.begin(IUTBITRATE);
|
||||
#endif
|
||||
logger.begin(9600);
|
||||
#endif
|
||||
|
||||
logger.println(PSTR("Loopback example for EspEspSoftwareSerial"));
|
||||
|
||||
start = micros();
|
||||
txCount = 0;
|
||||
rxCount = 0;
|
||||
rxErrors = 0;
|
||||
rxParityErrors = 0;
|
||||
expected = -1;
|
||||
}
|
||||
|
||||
unsigned char c = 0;
|
||||
|
||||
void loop() {
|
||||
#ifdef HALFDUPLEX
|
||||
char block[BLOCKSIZE];
|
||||
#endif
|
||||
char inBuf[BLOCKSIZE];
|
||||
for (int i = 0; i < BLOCKSIZE; ++i) {
|
||||
#ifndef HALFDUPLEX
|
||||
#ifdef HWSOURCESWSINK
|
||||
hwSerial.write(c);
|
||||
#else
|
||||
serialIUT.write(c);
|
||||
#endif
|
||||
#ifdef HWLOOPBACK
|
||||
int avail = hwSerial.available();
|
||||
while ((0 == (i % 8)) && avail > 0) {
|
||||
int inCnt = hwSerial.read(inBuf, min(avail, min(BLOCKSIZE, hwSerial.availableForWrite())));
|
||||
hwSerial.write(inBuf, inCnt);
|
||||
avail -= inCnt;
|
||||
}
|
||||
#endif
|
||||
#else
|
||||
block[i] = c;
|
||||
#endif
|
||||
c = (c + 1) % 256;
|
||||
++txCount;
|
||||
}
|
||||
#ifdef HALFDUPLEX
|
||||
#ifdef HWSOURCESWSINK
|
||||
hwSerial.write(block, BLOCKSIZE);
|
||||
#else
|
||||
serialIUT.write(block, BLOCKSIZE);
|
||||
#endif
|
||||
#endif
|
||||
#ifdef HWSOURCESINK
|
||||
#if defined(ESP8266)
|
||||
if (serialIUT.hasOverrun()) { logger.println(PSTR("serialIUT.overrun")); }
|
||||
#endif
|
||||
#else
|
||||
if (serialIUT.overflow()) { logger.println(PSTR("serialIUT.overflow")); }
|
||||
#endif
|
||||
|
||||
int inCnt;
|
||||
uint32_t deadlineStart;
|
||||
|
||||
#ifdef HWLOOPBACK
|
||||
// starting deadline for the first bytes to become readable
|
||||
deadlineStart = ESP.getCycleCount();
|
||||
inCnt = 0;
|
||||
while ((ESP.getCycleCount() - deadlineStart) < (1000000UL * 12 * BLOCKSIZE) / IUTBITRATE * 24 * ESP.getCpuFreqMHz()) {
|
||||
int avail = hwSerial.available();
|
||||
inCnt += hwSerial.read(&inBuf[inCnt], min(avail, min(BLOCKSIZE - inCnt, hwSerial.availableForWrite())));
|
||||
if (inCnt >= BLOCKSIZE) { break; }
|
||||
// wait for more outstanding bytes to trickle in
|
||||
if (avail) deadlineStart = ESP.getCycleCount();
|
||||
}
|
||||
hwSerial.write(inBuf, inCnt);
|
||||
#endif
|
||||
|
||||
// starting deadline for the first bytes to come in
|
||||
deadlineStart = ESP.getCycleCount();
|
||||
inCnt = 0;
|
||||
while ((ESP.getCycleCount() - deadlineStart) < (1000000UL * 12 * BLOCKSIZE) / IUTBITRATE * 8 * ESP.getCpuFreqMHz()) {
|
||||
int avail;
|
||||
if (0 != (swSerialConfig & 070))
|
||||
avail = serialIUT.available();
|
||||
else
|
||||
avail = serialIUT.read(inBuf, BLOCKSIZE);
|
||||
for (int i = 0; i < avail; ++i)
|
||||
{
|
||||
unsigned char r;
|
||||
if (0 != (swSerialConfig & 070))
|
||||
r = serialIUT.read();
|
||||
else
|
||||
r = inBuf[i];
|
||||
if (expected == -1) { expected = r; }
|
||||
else {
|
||||
expected = (expected + 1) % (1UL << (5 + swSerialConfig % 4));
|
||||
}
|
||||
if (r != expected) {
|
||||
++rxErrors;
|
||||
expected = -1;
|
||||
}
|
||||
#ifndef HWSOURCESINK
|
||||
if (serialIUT.readParity() != (static_cast<bool>(swSerialConfig & 010) ? serialIUT.parityOdd(r) : serialIUT.parityEven(r)))
|
||||
{
|
||||
++rxParityErrors;
|
||||
}
|
||||
#elif defined(ESP8266)
|
||||
// current ESP8266 API does not flag parity errors separately
|
||||
if (serialIUT.hasRxError())
|
||||
{
|
||||
++rxParityErrors;
|
||||
}
|
||||
#endif
|
||||
++rxCount;
|
||||
++inCnt;
|
||||
}
|
||||
|
||||
if (inCnt >= BLOCKSIZE) { break; }
|
||||
// wait for more outstanding bytes to trickle in
|
||||
if (avail) deadlineStart = ESP.getCycleCount();
|
||||
}
|
||||
|
||||
const uint32_t interval = micros() - start;
|
||||
if (txCount >= ReportInterval && interval) {
|
||||
uint8_t wordBits = (5 + swSerialConfig % 4) + static_cast<bool>(swSerialConfig & 070) + 1 + ((swSerialConfig & 0300) ? 1 : 0);
|
||||
logger.println(String(PSTR("tx/rx: ")) + txCount + PSTR("/") + rxCount);
|
||||
const long txCps = txCount * (1000000.0 / interval);
|
||||
const long rxCps = rxCount * (1000000.0 / interval);
|
||||
logger.print(String(FPSTR(effTxTxt)) + wordBits * txCps + PSTR("bps, ")
|
||||
+ effRxTxt + wordBits * rxCps + PSTR("bps, ")
|
||||
+ rxErrors + PSTR(" errors (") + 100.0 * rxErrors / (!rxErrors ? 1 : rxCount) + PSTR("%)"));
|
||||
if (0 != (swSerialConfig & 070))
|
||||
{
|
||||
logger.print(PSTR(" (")); logger.print(rxParityErrors); logger.println(PSTR(" parity errors)"));
|
||||
}
|
||||
else
|
||||
{
|
||||
logger.println();
|
||||
}
|
||||
txCount = 0;
|
||||
rxCount = 0;
|
||||
rxErrors = 0;
|
||||
rxParityErrors = 0;
|
||||
expected = -1;
|
||||
// resync
|
||||
delay(1000UL * 12 * BLOCKSIZE / IUTBITRATE * 16);
|
||||
serialIUT.flush();
|
||||
start = micros();
|
||||
}
|
||||
}
|
||||
59
lib/EspSoftwareSerial/examples/onewiretest/onewiretest.ino
Normal file
59
lib/EspSoftwareSerial/examples/onewiretest/onewiretest.ino
Normal file
@@ -0,0 +1,59 @@
|
||||
#include "SoftwareSerial.h"
|
||||
|
||||
#ifndef D5
|
||||
#if defined(ESP8266)
|
||||
#define D5 (14)
|
||||
#define D6 (12)
|
||||
#elif defined(ESP32)
|
||||
#define D5 (18)
|
||||
#define D6 (19)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
EspSoftwareSerial::UART swSer1;
|
||||
EspSoftwareSerial::UART swSer2;
|
||||
|
||||
void checkSwSerial(EspSoftwareSerial::UART* ss) {
|
||||
byte ch;
|
||||
while (!Serial.available());
|
||||
ss->enableTx(true);
|
||||
while (Serial.available()) {
|
||||
ch = Serial.read();
|
||||
ss->write(ch);
|
||||
}
|
||||
ss->enableTx(false);
|
||||
// wait 1 second for the reply from EspSoftwareSerial if any
|
||||
delay(1000);
|
||||
if (ss->available()) {
|
||||
Serial.print(PSTR("\nResult:"));
|
||||
while (ss->available()) {
|
||||
ch = (byte)ss->read();
|
||||
Serial.print(ch < 0x10 ? PSTR(" 0") : PSTR(" "));
|
||||
Serial.print(ch, HEX);
|
||||
}
|
||||
Serial.println();
|
||||
}
|
||||
}
|
||||
|
||||
void setup() {
|
||||
delay(2000);
|
||||
Serial.begin(115200);
|
||||
Serial.println(PSTR("\nOne Wire Half Duplex Serial Tester"));
|
||||
swSer1.begin(115200, EspSoftwareSerial::SWSERIAL_8N1, D6, D6, false, 256);
|
||||
// high speed half duplex, turn off interrupts during tx
|
||||
swSer1.enableIntTx(false);
|
||||
swSer2.begin(115200, EspSoftwareSerial::SWSERIAL_8N1, D5, D5, false, 256);
|
||||
// high speed half duplex, turn off interrupts during tx
|
||||
swSer2.enableIntTx(false);
|
||||
}
|
||||
|
||||
void loop() {
|
||||
Serial.println(PSTR("\n\nTesting on swSer1"));
|
||||
Serial.print(PSTR("Enter something to send using swSer1."));
|
||||
checkSwSerial(&swSer1);
|
||||
|
||||
Serial.println(PSTR("\n\nTesting on swSer2"));
|
||||
Serial.print(PSTR("Enter something to send using swSer2."));
|
||||
checkSwSerial(&swSer2);
|
||||
|
||||
}
|
||||
80
lib/EspSoftwareSerial/examples/onreceive/onreceive.ino
Normal file
80
lib/EspSoftwareSerial/examples/onreceive/onreceive.ino
Normal file
@@ -0,0 +1,80 @@
|
||||
// On ESP8266:
|
||||
// Runs up to 115200bps at 80MHz, 250000bps at 160MHz, with nearly zero errors.
|
||||
// This example is currently not ported to ESP32, which is based on FreeRTOS.
|
||||
|
||||
#include <SoftwareSerial.h>
|
||||
|
||||
#ifndef D5
|
||||
#define D8 (15)
|
||||
#define D5 (14)
|
||||
#define D7 (13)
|
||||
#define D6 (12)
|
||||
#define RX (3)
|
||||
#define TX (1)
|
||||
#endif
|
||||
|
||||
#define BAUD_RATE 115200
|
||||
#define MAX_FRAMEBITS (1 + 8 + 1 + 2)
|
||||
|
||||
EspSoftwareSerial::UART testSerial;
|
||||
|
||||
// Becomes set from ISR / IRQ callback function.
|
||||
std::atomic<bool> rxPending(false);
|
||||
|
||||
void IRAM_ATTR receiveHandler() {
|
||||
rxPending.store(true);
|
||||
esp_schedule();
|
||||
}
|
||||
|
||||
void setup() {
|
||||
Serial.begin(115200);
|
||||
Serial.setDebugOutput(false);
|
||||
Serial.swap();
|
||||
testSerial.begin(BAUD_RATE, EspSoftwareSerial::SWSERIAL_8N1, RX, TX);
|
||||
// Only half duplex this way, but reliable TX timings for high bps
|
||||
testSerial.enableIntTx(false);
|
||||
testSerial.onReceive(receiveHandler);
|
||||
|
||||
testSerial.println(PSTR("\nSoftware serial onReceive() event test started"));
|
||||
|
||||
for (char ch = ' '; ch <= 'z'; ch++) {
|
||||
testSerial.write(ch);
|
||||
}
|
||||
testSerial.println();
|
||||
}
|
||||
|
||||
void loop() {
|
||||
#ifdef ESP8266
|
||||
bool isRxPending = rxPending.load();
|
||||
if (isRxPending) {
|
||||
rxPending.store(false);
|
||||
}
|
||||
#else
|
||||
bool isRxPending = m_isrOverflow.exchange(false);
|
||||
#endif
|
||||
auto avail = testSerial.available();
|
||||
if (isRxPending && !avail) {
|
||||
// event fired on start bit, wait until first stop bit of longest frame
|
||||
delayMicroseconds(1 + MAX_FRAMEBITS * 1000000 / BAUD_RATE);
|
||||
avail = testSerial.available();
|
||||
}
|
||||
if (!avail) {
|
||||
// On development board, idle power draw at USB:
|
||||
// with yield() 77mA, 385mW (160MHz: 82mA, 410mW)
|
||||
// with esp_suspend() 20mA, 100mW (at 160MHz, too)
|
||||
//yield();
|
||||
esp_suspend();
|
||||
return;
|
||||
}
|
||||
// try to force to half-duplex
|
||||
decltype(avail) prev_avail;
|
||||
do {
|
||||
delayMicroseconds(1 + MAX_FRAMEBITS * 1000000 / BAUD_RATE);
|
||||
prev_avail = avail;
|
||||
} while (prev_avail != (avail = testSerial.available()));
|
||||
while (avail > 0) {
|
||||
testSerial.write(testSerial.read());
|
||||
avail = testSerial.available();
|
||||
}
|
||||
testSerial.println();
|
||||
}
|
||||
199
lib/EspSoftwareSerial/examples/repeater/repeater.ino
Normal file
199
lib/EspSoftwareSerial/examples/repeater/repeater.ino
Normal file
@@ -0,0 +1,199 @@
|
||||
#include <SoftwareSerial.h>
|
||||
|
||||
// On ESP8266:
|
||||
// EspSoftwareSerial loopback for remote source (loopback.ino), or hardware loopback.
|
||||
// Connect source D5 (rx) to local D8 (tx), source D6 (tx) to local D7 (rx).
|
||||
// Hint: The logger is run at 9600bps such that enableIntTx(true) can remain unchanged. Blocking
|
||||
// interrupts severely impacts the ability of the EspSoftwareSerial devices to operate concurrently
|
||||
// and/or in duplex mode.
|
||||
// On ESP32:
|
||||
// For software or hardware loopback, connect source rx to local D8 (tx), source tx to local D7 (rx).
|
||||
|
||||
#ifndef D5
|
||||
#if defined(ESP8266)
|
||||
#define D8 (15)
|
||||
#define D5 (14)
|
||||
#define D7 (13)
|
||||
#define D6 (12)
|
||||
#define RX (3)
|
||||
#define TX (1)
|
||||
#elif defined(ESP32)
|
||||
#define D8 (5)
|
||||
#define D5 (18)
|
||||
#define D7 (23)
|
||||
#define D6 (19)
|
||||
#define RX (3)
|
||||
#define TX (1)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define HWLOOPBACK 1
|
||||
#define HALFDUPLEX 1
|
||||
|
||||
#ifdef ESP32
|
||||
constexpr int IUTBITRATE = 19200;
|
||||
#else
|
||||
constexpr int IUTBITRATE = 19200;
|
||||
#endif
|
||||
|
||||
#if defined(ESP8266)
|
||||
constexpr EspSoftwareSerial::Config swSerialConfig = EspSoftwareSerial::SWSERIAL_8E1;
|
||||
constexpr SerialConfig hwSerialConfig = ::SERIAL_8E1;
|
||||
#elif defined(ESP32)
|
||||
constexpr EspSoftwareSerial::Config swSerialConfig = EspSoftwareSerial::SWSERIAL_8E1;
|
||||
constexpr uint32_t hwSerialConfig = ::SERIAL_8E1;
|
||||
#else
|
||||
constexpr unsigned swSerialConfig = 3;
|
||||
#endif
|
||||
constexpr bool invert = false;
|
||||
|
||||
constexpr int BLOCKSIZE = 16; // use fractions of 256
|
||||
|
||||
unsigned long start;
|
||||
const char bitRateTxt[] PROGMEM = "Effective data rate: ";
|
||||
int rxCount;
|
||||
int seqErrors;
|
||||
int parityErrors;
|
||||
int expected;
|
||||
constexpr int ReportInterval = IUTBITRATE / 8;
|
||||
|
||||
#if defined(ESP8266)
|
||||
#if defined(HWLOOPBACK)
|
||||
HardwareSerial& repeater(Serial);
|
||||
EspSoftwareSerial::UART logger;
|
||||
#else
|
||||
EspSoftwareSerial::UART repeater;
|
||||
HardwareSerial& logger(Serial);
|
||||
#endif
|
||||
#elif defined(ESP32)
|
||||
#if defined(HWLOOPBACK)
|
||||
HardwareSerial& repeater(Serial2);
|
||||
#else
|
||||
EspSoftwareSerial::UART repeater;
|
||||
#endif
|
||||
HardwareSerial& logger(Serial);
|
||||
#else
|
||||
EspSoftwareSerial::UART repeater(14, 12);
|
||||
HardwareSerial& logger(Serial);
|
||||
#endif
|
||||
|
||||
void setup() {
|
||||
#if defined(ESP8266)
|
||||
#if defined(HWLOOPBACK)
|
||||
repeater.begin(IUTBITRATE, hwSerialConfig, ::SERIAL_FULL, 1, invert);
|
||||
repeater.swap();
|
||||
repeater.setRxBufferSize(2 * BLOCKSIZE);
|
||||
logger.begin(9600, EspSoftwareSerial::SWSERIAL_8N1, -1, TX);
|
||||
#else
|
||||
repeater.begin(IUTBITRATE, swSerialConfig, D7, D8, invert, 4 * BLOCKSIZE);
|
||||
#ifdef HALFDUPLEX
|
||||
repeater.enableIntTx(false);
|
||||
#endif
|
||||
logger.begin(9600);
|
||||
#endif
|
||||
#elif defined(ESP32)
|
||||
#if defined(HWLOOPBACK)
|
||||
repeater.begin(IUTBITRATE, hwSerialConfig, D7, D8, invert);
|
||||
repeater.setRxBufferSize(2 * BLOCKSIZE);
|
||||
#else
|
||||
repeater.begin(IUTBITRATE, swSerialConfig, D7, D8, invert, 4 * BLOCKSIZE);
|
||||
#ifdef HALFDUPLEX
|
||||
repeater.enableIntTx(false);
|
||||
#endif
|
||||
#endif
|
||||
logger.begin(9600);
|
||||
#else
|
||||
repeater.begin(IUTBITRATE);
|
||||
logger.begin(9600);
|
||||
#endif
|
||||
|
||||
logger.println(PSTR("Repeater example for EspEspSoftwareSerial"));
|
||||
start = micros();
|
||||
rxCount = 0;
|
||||
seqErrors = 0;
|
||||
parityErrors = 0;
|
||||
expected = -1;
|
||||
}
|
||||
|
||||
void loop() {
|
||||
#ifdef HWLOOPBACK
|
||||
#if defined(ESP8266)
|
||||
if (repeater.hasOverrun()) { logger.println(PSTR("repeater.overrun")); }
|
||||
#endif
|
||||
#else
|
||||
if (repeater.overflow()) { logger.println(PSTR("repeater.overflow")); }
|
||||
#endif
|
||||
|
||||
#ifdef HALFDUPLEX
|
||||
char block[BLOCKSIZE];
|
||||
#endif
|
||||
// starting deadline for the first bytes to come in
|
||||
uint32_t deadlineStart = ESP.getCycleCount();
|
||||
int inCnt = 0;
|
||||
while ((ESP.getCycleCount() - deadlineStart) < (1000000UL * 12 * BLOCKSIZE) / IUTBITRATE * 24 * ESP.getCpuFreqMHz()) {
|
||||
int avail = repeater.available();
|
||||
for (int i = 0; i < avail; ++i)
|
||||
{
|
||||
int r = repeater.read();
|
||||
if (r == -1) { logger.println(PSTR("read() == -1")); }
|
||||
if (expected == -1) { expected = r; }
|
||||
else {
|
||||
expected = (expected + 1) % (1UL << (5 + swSerialConfig % 4));
|
||||
}
|
||||
if (r != expected) {
|
||||
++seqErrors;
|
||||
expected = -1;
|
||||
}
|
||||
#ifndef HWLOOPBACK
|
||||
if (repeater.readParity() != (static_cast<bool>(swSerialConfig & 010) ? repeater.parityOdd(r) : repeater.parityEven(r)))
|
||||
{
|
||||
++parityErrors;
|
||||
}
|
||||
#elif defined(ESP8266)
|
||||
// current ESP8266 API does not flag parity errors separately
|
||||
if (repeater.hasRxError())
|
||||
{
|
||||
++parityErrors;
|
||||
}
|
||||
#endif
|
||||
++rxCount;
|
||||
#ifdef HALFDUPLEX
|
||||
block[inCnt] = r;
|
||||
#else
|
||||
repeater.write(r);
|
||||
#endif
|
||||
if (++inCnt >= BLOCKSIZE) { break; }
|
||||
}
|
||||
if (inCnt >= BLOCKSIZE) { break; }
|
||||
// wait for more outstanding bytes to trickle in
|
||||
if (avail) deadlineStart = ESP.getCycleCount();
|
||||
}
|
||||
|
||||
#ifdef HALFDUPLEX
|
||||
repeater.write(block, inCnt);
|
||||
#endif
|
||||
|
||||
if (rxCount >= ReportInterval) {
|
||||
auto end = micros();
|
||||
unsigned long interval = end - start;
|
||||
long cps = rxCount * (1000000.0 / interval);
|
||||
long seqErrorsps = seqErrors * (1000000.0 / interval);
|
||||
logger.print(String(FPSTR(bitRateTxt)) + 10 * cps + PSTR("bps, ")
|
||||
+ seqErrorsps + PSTR("cps seq. errors (") + 100.0 * seqErrors / rxCount + PSTR("%)"));
|
||||
#ifndef HWLOOPBACK
|
||||
if (0 != (swSerialConfig & 070))
|
||||
{
|
||||
logger.print(PSTR(" (")); logger.print(parityErrors); logger.println(PSTR(" parity errors)"));
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
logger.println();
|
||||
}
|
||||
start = end;
|
||||
rxCount = 0;
|
||||
seqErrors = 0;
|
||||
parityErrors = 0;
|
||||
expected = -1;
|
||||
}
|
||||
}
|
||||
79
lib/EspSoftwareSerial/examples/swsertest/swsertest.ino
Normal file
79
lib/EspSoftwareSerial/examples/swsertest/swsertest.ino
Normal file
@@ -0,0 +1,79 @@
|
||||
// On ESP8266:
|
||||
// At 80MHz runs up 57600bps, and at 160MHz CPU frequency up to 115200bps with only negligible errors.
|
||||
// Connect pin 13 to 15.
|
||||
// For verification and as a example for how to use SW serial on the USB to PC connection,
|
||||
// which allows the use of HW Serial on GPIO13 and GPIO15 instead, #define SWAPSERIAL below.
|
||||
// Notice how the bitrates are also swapped then between RX/TX and GPIO13/GPIO15.
|
||||
// Builtin debug output etc. must be stopped on HW Serial in this case, as it would interfere with the
|
||||
// external communication on GPIO13/GPIO15.
|
||||
|
||||
#include <SoftwareSerial.h>
|
||||
|
||||
#ifndef D5
|
||||
#if defined(ESP8266)
|
||||
#define D8 (15)
|
||||
#define D5 (14)
|
||||
#define D7 (13)
|
||||
#define D6 (12)
|
||||
#define RX (3)
|
||||
#define TX (1)
|
||||
#elif defined(ESP32)
|
||||
#define D8 (5)
|
||||
#define D5 (18)
|
||||
#define D7 (23)
|
||||
#define D6 (19)
|
||||
#define RX (3)
|
||||
#define TX (1)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef ESP32
|
||||
#define BAUD_RATE 57600
|
||||
#else
|
||||
#define BAUD_RATE 57600
|
||||
#endif
|
||||
|
||||
#undef SWAPSERIAL
|
||||
|
||||
#ifndef SWAPSERIAL
|
||||
auto& usbSerial = Serial;
|
||||
EspSoftwareSerial::UART testSerial;
|
||||
#else
|
||||
EspSoftwareSerial::UART usbSerial;
|
||||
auto& testSerial = Serial;
|
||||
#endif
|
||||
|
||||
void setup() {
|
||||
#ifndef SWAPSERIAL
|
||||
usbSerial.begin(115200);
|
||||
// Important: the buffer size optimizations here, in particular the isrBufSize (11) that is only sufficiently
|
||||
// large to hold a single word (up to start - 8 data - parity - stop), are on the basis that any char written
|
||||
// to the loopback EspSoftwareSerial adapter gets read before another write is performed.
|
||||
// Block writes with a size greater than 1 would usually fail. Do not copy this into your own project without
|
||||
// reading the documentation.
|
||||
testSerial.begin(BAUD_RATE, EspSoftwareSerial::SWSERIAL_8N1, D7, D8, false, 95, 11);
|
||||
#else
|
||||
testSerial.begin(115200);
|
||||
testSerial.setDebugOutput(false);
|
||||
testSerial.swap();
|
||||
usbSerial.begin(BAUD_RATE, EspSoftwareSerial::SWSERIAL_8N1, RX, TX, false, 95);
|
||||
#endif
|
||||
|
||||
usbSerial.println(PSTR("\nSoftware serial test started"));
|
||||
|
||||
for (char ch = ' '; ch <= 'z'; ch++) {
|
||||
testSerial.write(ch);
|
||||
}
|
||||
testSerial.println();
|
||||
}
|
||||
|
||||
void loop() {
|
||||
while (testSerial.available() > 0) {
|
||||
usbSerial.write(testSerial.read());
|
||||
yield();
|
||||
}
|
||||
while (usbSerial.available() > 0) {
|
||||
testSerial.write(usbSerial.read());
|
||||
yield();
|
||||
}
|
||||
}
|
||||
43
lib/EspSoftwareSerial/keywords.txt
Normal file
43
lib/EspSoftwareSerial/keywords.txt
Normal file
@@ -0,0 +1,43 @@
|
||||
#######################################
|
||||
# Syntax Coloring Map for EspSoftwareSerial
|
||||
# (esp8266)
|
||||
#######################################
|
||||
|
||||
#######################################
|
||||
# Datatypes (KEYWORD1)
|
||||
#######################################
|
||||
|
||||
EspSoftwareSerial KEYWORD1
|
||||
SoftwareSerial KEYWORD1
|
||||
|
||||
#######################################
|
||||
# Methods and Functions (KEYWORD2)
|
||||
#######################################
|
||||
|
||||
begin KEYWORD2
|
||||
baudRate KEYWORD2
|
||||
setTransmitEnablePin KEYWORD2
|
||||
enableIntTx KEYWORD2
|
||||
overflow KEYWORD2
|
||||
available KEYWORD2
|
||||
peek KEYWORD2
|
||||
read KEYWORD2
|
||||
flush KEYWORD2
|
||||
write KEYWORD2
|
||||
enableRx KEYWORD2
|
||||
enableTx KEYWORD2
|
||||
listen KEYWORD2
|
||||
end KEYWORD2
|
||||
isListening KEYWORD2
|
||||
stopListening KEYWORD2
|
||||
onReceive KEYWORD2
|
||||
|
||||
#######################################
|
||||
# Constants (LITERAL1)
|
||||
#######################################
|
||||
|
||||
SW_SERIAL_UNUSED_PIN LITERAL1
|
||||
SWSERIAL_5N1 LITERAL1
|
||||
SWSERIAL_6N1 LITERAL1
|
||||
SWSERIAL_7N1 LITERAL1
|
||||
SWSERIAL_8N1 LITERAL1
|
||||
26
lib/EspSoftwareSerial/library.json
Normal file
26
lib/EspSoftwareSerial/library.json
Normal file
@@ -0,0 +1,26 @@
|
||||
{
|
||||
"name": "EspSoftwareSerial",
|
||||
"version": "8.1.0",
|
||||
"description": "Implementation of the Arduino software serial for ESP8266/ESP32.",
|
||||
"keywords": [
|
||||
"serial", "io", "softwareserial"
|
||||
],
|
||||
"repository":
|
||||
{
|
||||
"type": "git",
|
||||
"url": "https://github.com/plerup/espsoftwareserial"
|
||||
},
|
||||
"authors": [
|
||||
{
|
||||
"name": "Dirk Kaar"
|
||||
},
|
||||
{
|
||||
"name": "Peter Lerup"
|
||||
}
|
||||
],
|
||||
"license": "LGPL-2.1+",
|
||||
"frameworks": "arduino",
|
||||
"platforms": [
|
||||
"espressif8266", "espressif32"
|
||||
]
|
||||
}
|
||||
9
lib/EspSoftwareSerial/library.properties
Normal file
9
lib/EspSoftwareSerial/library.properties
Normal file
@@ -0,0 +1,9 @@
|
||||
name=EspSoftwareSerial
|
||||
version=8.1.0
|
||||
author=Dirk Kaar, Peter Lerup
|
||||
maintainer=Dirk Kaar <dok@dok-net.net>
|
||||
sentence=Implementation of the Arduino software serial for ESP8266/ESP32.
|
||||
paragraph=
|
||||
category=Signal Input/Output
|
||||
url=https://github.com/plerup/espsoftwareserial/
|
||||
architectures=esp8266,esp32
|
||||
621
lib/EspSoftwareSerial/src/SoftwareSerial.cpp
Normal file
621
lib/EspSoftwareSerial/src/SoftwareSerial.cpp
Normal file
@@ -0,0 +1,621 @@
|
||||
/*
|
||||
|
||||
SoftwareSerial.cpp - Implementation of the Arduino software serial for ESP8266/ESP32.
|
||||
Copyright (c) 2015-2016 Peter Lerup. All rights reserved.
|
||||
Copyright (c) 2018-2019 Dirk O. Kaar. All rights reserved.
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
This library 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
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
*/
|
||||
|
||||
#include "SoftwareSerial.h"
|
||||
#include <Arduino.h>
|
||||
|
||||
using namespace EspSoftwareSerial;
|
||||
|
||||
#ifndef ESP32
|
||||
uint32_t UARTBase::m_savedPS = 0;
|
||||
#else
|
||||
portMUX_TYPE UARTBase::m_interruptsMux = portMUX_INITIALIZER_UNLOCKED;
|
||||
#endif
|
||||
|
||||
ALWAYS_INLINE_ATTR inline void IRAM_ATTR UARTBase::disableInterrupts()
|
||||
{
|
||||
#ifndef ESP32
|
||||
m_savedPS = xt_rsil(15);
|
||||
#else
|
||||
taskENTER_CRITICAL(&m_interruptsMux);
|
||||
#endif
|
||||
}
|
||||
|
||||
ALWAYS_INLINE_ATTR inline void IRAM_ATTR UARTBase::restoreInterrupts()
|
||||
{
|
||||
#ifndef ESP32
|
||||
xt_wsr_ps(m_savedPS);
|
||||
#else
|
||||
taskEXIT_CRITICAL(&m_interruptsMux);
|
||||
#endif
|
||||
}
|
||||
|
||||
constexpr uint8_t BYTE_ALL_BITS_SET = ~static_cast<uint8_t>(0);
|
||||
|
||||
UARTBase::UARTBase() {
|
||||
}
|
||||
|
||||
UARTBase::UARTBase(int8_t rxPin, int8_t txPin, bool invert)
|
||||
{
|
||||
m_rxPin = rxPin;
|
||||
m_txPin = txPin;
|
||||
m_invert = invert;
|
||||
}
|
||||
|
||||
UARTBase::~UARTBase() {
|
||||
end();
|
||||
}
|
||||
|
||||
void UARTBase::setRxGPIOPinMode() {
|
||||
if (m_rxValid) {
|
||||
pinMode(m_rxPin, m_rxGPIOHasPullUp && m_rxGPIOPullUpEnabled ? INPUT_PULLUP : INPUT);
|
||||
}
|
||||
}
|
||||
|
||||
void UARTBase::setTxGPIOPinMode() {
|
||||
if (m_txValid) {
|
||||
pinMode(m_txPin, m_txGPIOOpenDrain ? OUTPUT_OPEN_DRAIN : OUTPUT);
|
||||
}
|
||||
}
|
||||
|
||||
void UARTBase::begin(uint32_t baud, Config config,
|
||||
int8_t rxPin, int8_t txPin,
|
||||
bool invert) {
|
||||
if (-1 != rxPin) m_rxPin = rxPin;
|
||||
if (-1 != txPin) m_txPin = txPin;
|
||||
m_oneWire = (m_rxPin == m_txPin);
|
||||
m_invert = invert;
|
||||
m_dataBits = 5 + (config & 07);
|
||||
m_parityMode = static_cast<Parity>(config & 070);
|
||||
m_stopBits = 1 + ((config & 0300) ? 1 : 0);
|
||||
m_pduBits = m_dataBits + static_cast<bool>(m_parityMode) + m_stopBits;
|
||||
m_bitTicks = (microsToTicks(1000000UL) + baud / 2) / baud;
|
||||
m_intTxEnabled = true;
|
||||
}
|
||||
|
||||
void UARTBase::beginRx(bool hasPullUp, int bufCapacity, int isrBufCapacity) {
|
||||
m_rxGPIOHasPullUp = hasPullUp;
|
||||
m_rxReg = portInputRegister(digitalPinToPort(m_rxPin));
|
||||
m_rxBitMask = digitalPinToBitMask(m_rxPin);
|
||||
m_buffer.reset(new circular_queue<uint8_t>((bufCapacity > 0) ? bufCapacity : 64));
|
||||
if (m_parityMode)
|
||||
{
|
||||
m_parityBuffer.reset(new circular_queue<uint8_t>((m_buffer->capacity() + 7) / 8));
|
||||
m_parityInPos = m_parityOutPos = 1;
|
||||
}
|
||||
m_isrBuffer.reset(new circular_queue<uint32_t, UARTBase*>((isrBufCapacity > 0) ?
|
||||
isrBufCapacity : m_buffer->capacity() * (2 + m_dataBits + static_cast<bool>(m_parityMode))));
|
||||
if (m_buffer && (!m_parityMode || m_parityBuffer) && m_isrBuffer) {
|
||||
m_rxValid = true;
|
||||
setRxGPIOPinMode();
|
||||
}
|
||||
}
|
||||
|
||||
void UARTBase::beginTx() {
|
||||
#if !defined(ESP8266)
|
||||
m_txReg = portOutputRegister(digitalPinToPort(m_txPin));
|
||||
#endif
|
||||
m_txBitMask = digitalPinToBitMask(m_txPin);
|
||||
m_txValid = true;
|
||||
if (!m_oneWire) {
|
||||
setTxGPIOPinMode();
|
||||
digitalWrite(m_txPin, !m_invert);
|
||||
}
|
||||
}
|
||||
|
||||
void UARTBase::end()
|
||||
{
|
||||
enableRx(false);
|
||||
m_txValid = false;
|
||||
if (m_buffer) {
|
||||
m_buffer.reset();
|
||||
}
|
||||
m_parityBuffer.reset();
|
||||
if (m_isrBuffer) {
|
||||
m_isrBuffer.reset();
|
||||
}
|
||||
}
|
||||
|
||||
uint32_t UARTBase::baudRate() {
|
||||
return 1000000UL / ticksToMicros(m_bitTicks);
|
||||
}
|
||||
|
||||
void UARTBase::setTransmitEnablePin(int8_t txEnablePin) {
|
||||
if (-1 != txEnablePin) {
|
||||
m_txEnableValid = true;
|
||||
m_txEnablePin = txEnablePin;
|
||||
pinMode(m_txEnablePin, OUTPUT);
|
||||
digitalWrite(m_txEnablePin, LOW);
|
||||
}
|
||||
else {
|
||||
m_txEnableValid = false;
|
||||
}
|
||||
}
|
||||
|
||||
void UARTBase::enableIntTx(bool on) {
|
||||
m_intTxEnabled = on;
|
||||
}
|
||||
|
||||
void UARTBase::enableRxGPIOPullUp(bool on) {
|
||||
m_rxGPIOPullUpEnabled = on;
|
||||
setRxGPIOPinMode();
|
||||
}
|
||||
|
||||
void UARTBase::enableTxGPIOOpenDrain(bool on) {
|
||||
m_txGPIOOpenDrain = on;
|
||||
setTxGPIOPinMode();
|
||||
}
|
||||
|
||||
void UARTBase::enableTx(bool on) {
|
||||
if (m_txValid && m_oneWire) {
|
||||
if (on) {
|
||||
enableRx(false);
|
||||
setTxGPIOPinMode();
|
||||
digitalWrite(m_txPin, !m_invert);
|
||||
}
|
||||
else {
|
||||
setRxGPIOPinMode();
|
||||
enableRx(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void UARTBase::enableRx(bool on) {
|
||||
if (m_rxValid && on != m_rxEnabled) {
|
||||
if (on) {
|
||||
m_rxLastBit = m_pduBits - 1;
|
||||
// Init to stop bit level and current tick
|
||||
m_isrLastTick = (microsToTicks(micros()) | 1) ^ m_invert;
|
||||
if (m_bitTicks >= microsToTicks(1000000UL / 74880UL))
|
||||
attachInterruptArg(digitalPinToInterrupt(m_rxPin), reinterpret_cast<void (*)(void*)>(rxBitISR), this, CHANGE);
|
||||
else
|
||||
attachInterruptArg(digitalPinToInterrupt(m_rxPin), reinterpret_cast<void (*)(void*)>(rxBitSyncISR), this, m_invert ? RISING : FALLING);
|
||||
}
|
||||
else {
|
||||
detachInterrupt(digitalPinToInterrupt(m_rxPin));
|
||||
}
|
||||
m_rxEnabled = on;
|
||||
}
|
||||
}
|
||||
|
||||
int UARTBase::read() {
|
||||
if (!m_rxValid) { return -1; }
|
||||
if (!m_buffer->available()) {
|
||||
rxBits();
|
||||
if (!m_buffer->available()) { return -1; }
|
||||
}
|
||||
auto val = m_buffer->pop();
|
||||
if (m_parityBuffer)
|
||||
{
|
||||
m_lastReadParity = m_parityBuffer->peek() & m_parityOutPos;
|
||||
m_parityOutPos <<= 1;
|
||||
if (!m_parityOutPos)
|
||||
{
|
||||
m_parityOutPos = 1;
|
||||
m_parityBuffer->pop();
|
||||
}
|
||||
}
|
||||
return val;
|
||||
}
|
||||
|
||||
int UARTBase::read(uint8_t* buffer, size_t size) {
|
||||
if (!m_rxValid) { return 0; }
|
||||
int avail;
|
||||
if (0 == (avail = m_buffer->pop_n(buffer, size))) {
|
||||
rxBits();
|
||||
avail = m_buffer->pop_n(buffer, size);
|
||||
}
|
||||
if (!avail) return 0;
|
||||
if (m_parityBuffer) {
|
||||
uint32_t parityBits = avail;
|
||||
while (m_parityOutPos >>= 1) ++parityBits;
|
||||
m_parityOutPos = (1 << (parityBits % 8));
|
||||
m_parityBuffer->pop_n(nullptr, parityBits / 8);
|
||||
}
|
||||
return avail;
|
||||
}
|
||||
|
||||
size_t UARTBase::readBytes(uint8_t* buffer, size_t size) {
|
||||
if (!m_rxValid || !size) { return 0; }
|
||||
size_t count = 0;
|
||||
auto start = millis();
|
||||
do {
|
||||
auto readCnt = read(&buffer[count], size - count);
|
||||
count += readCnt;
|
||||
if (count >= size) break;
|
||||
if (readCnt) {
|
||||
start = millis();
|
||||
}
|
||||
else {
|
||||
optimistic_yield(1000UL);
|
||||
}
|
||||
} while (millis() - start < _timeout);
|
||||
return count;
|
||||
}
|
||||
|
||||
int UARTBase::available() {
|
||||
if (!m_rxValid) { return 0; }
|
||||
rxBits();
|
||||
int avail = m_buffer->available();
|
||||
if (!avail) {
|
||||
optimistic_yield(10000UL);
|
||||
}
|
||||
return avail;
|
||||
}
|
||||
|
||||
void UARTBase::lazyDelay() {
|
||||
// Reenable interrupts while delaying to avoid other tasks piling up
|
||||
if (!m_intTxEnabled) { restoreInterrupts(); }
|
||||
const auto expired = microsToTicks(micros()) - m_periodStart;
|
||||
const int32_t remaining = m_periodDuration - expired;
|
||||
const uint32_t ms = remaining > 0 ? ticksToMicros(remaining) / 1000UL : 0;
|
||||
if (ms > 0)
|
||||
{
|
||||
delay(ms);
|
||||
}
|
||||
else
|
||||
{
|
||||
optimistic_yield(10000UL);
|
||||
}
|
||||
// Assure that below-ms part of delays are not elided
|
||||
preciseDelay();
|
||||
// Disable interrupts again if applicable
|
||||
if (!m_intTxEnabled) { disableInterrupts(); }
|
||||
}
|
||||
|
||||
void IRAM_ATTR UARTBase::preciseDelay() {
|
||||
uint32_t ticks;
|
||||
do {
|
||||
ticks = microsToTicks(micros());
|
||||
} while ((ticks - m_periodStart) < m_periodDuration);
|
||||
m_periodDuration = 0;
|
||||
m_periodStart = ticks;
|
||||
}
|
||||
|
||||
void IRAM_ATTR UARTBase::writePeriod(
|
||||
uint32_t dutyCycle, uint32_t offCycle, bool withStopBit) {
|
||||
preciseDelay();
|
||||
if (dutyCycle)
|
||||
{
|
||||
#if defined(ESP8266)
|
||||
if (16 == m_txPin) {
|
||||
GP16O = 1;
|
||||
}
|
||||
else {
|
||||
GPOS = m_txBitMask;
|
||||
}
|
||||
#else
|
||||
*m_txReg = *m_txReg | m_txBitMask;
|
||||
#endif
|
||||
m_periodDuration += dutyCycle;
|
||||
if (offCycle || (withStopBit && !m_invert)) {
|
||||
if (!withStopBit || m_invert) {
|
||||
preciseDelay();
|
||||
}
|
||||
else {
|
||||
lazyDelay();
|
||||
}
|
||||
}
|
||||
}
|
||||
if (offCycle)
|
||||
{
|
||||
#if defined(ESP8266)
|
||||
if (16 == m_txPin) {
|
||||
GP16O = 0;
|
||||
}
|
||||
else {
|
||||
GPOC = m_txBitMask;
|
||||
}
|
||||
#else
|
||||
*m_txReg = *m_txReg & ~m_txBitMask;
|
||||
#endif
|
||||
m_periodDuration += offCycle;
|
||||
if (withStopBit && m_invert) lazyDelay();
|
||||
}
|
||||
}
|
||||
|
||||
size_t UARTBase::write(uint8_t byte) {
|
||||
return write(&byte, 1);
|
||||
}
|
||||
|
||||
size_t UARTBase::write(uint8_t byte, Parity parity) {
|
||||
return write(&byte, 1, parity);
|
||||
}
|
||||
|
||||
size_t UARTBase::write(const uint8_t* buffer, size_t size) {
|
||||
return write(buffer, size, m_parityMode);
|
||||
}
|
||||
|
||||
size_t IRAM_ATTR UARTBase::write(const uint8_t* buffer, size_t size, Parity parity) {
|
||||
if (m_rxValid) { rxBits(); }
|
||||
if (!m_txValid) { return -1; }
|
||||
|
||||
if (m_txEnableValid) {
|
||||
digitalWrite(m_txEnablePin, HIGH);
|
||||
}
|
||||
// Stop bit: if inverted, LOW, otherwise HIGH
|
||||
bool b = !m_invert;
|
||||
uint32_t dutyCycle = 0;
|
||||
uint32_t offCycle = 0;
|
||||
if (!m_intTxEnabled) {
|
||||
// Disable interrupts in order to get a clean transmit timing
|
||||
disableInterrupts();
|
||||
}
|
||||
const uint32_t dataMask = ((1UL << m_dataBits) - 1);
|
||||
bool withStopBit = true;
|
||||
m_periodDuration = 0;
|
||||
m_periodStart = microsToTicks(micros());
|
||||
for (size_t cnt = 0; cnt < size; ++cnt) {
|
||||
uint8_t byte = pgm_read_byte(buffer + cnt) & dataMask;
|
||||
// push LSB start-data-parity-stop bit pattern into uint32_t
|
||||
// Stop bits: HIGH
|
||||
uint32_t word = ~0UL;
|
||||
// inverted parity bit, performance tweak for xor all-bits-set word
|
||||
if (parity && m_parityMode)
|
||||
{
|
||||
uint32_t parityBit;
|
||||
switch (parity)
|
||||
{
|
||||
case PARITY_EVEN:
|
||||
// from inverted, so use odd parity
|
||||
parityBit = byte;
|
||||
parityBit ^= parityBit >> 4;
|
||||
parityBit &= 0xf;
|
||||
parityBit = (0x9669 >> parityBit) & 1;
|
||||
break;
|
||||
case PARITY_ODD:
|
||||
// from inverted, so use even parity
|
||||
parityBit = byte;
|
||||
parityBit ^= parityBit >> 4;
|
||||
parityBit &= 0xf;
|
||||
parityBit = (0x6996 >> parityBit) & 1;
|
||||
break;
|
||||
case PARITY_MARK:
|
||||
parityBit = 0;
|
||||
break;
|
||||
case PARITY_SPACE:
|
||||
// suppresses warning parityBit uninitialized
|
||||
default:
|
||||
parityBit = 1;
|
||||
break;
|
||||
}
|
||||
word ^= parityBit;
|
||||
}
|
||||
word <<= m_dataBits;
|
||||
word |= byte;
|
||||
// Start bit: LOW
|
||||
word <<= 1;
|
||||
if (m_invert) word = ~word;
|
||||
for (int i = 0; i <= m_pduBits; ++i) {
|
||||
bool pb = b;
|
||||
b = word & (1UL << i);
|
||||
if (!pb && b) {
|
||||
writePeriod(dutyCycle, offCycle, withStopBit);
|
||||
withStopBit = false;
|
||||
dutyCycle = offCycle = 0;
|
||||
}
|
||||
if (b) {
|
||||
dutyCycle += m_bitTicks;
|
||||
}
|
||||
else {
|
||||
offCycle += m_bitTicks;
|
||||
}
|
||||
}
|
||||
withStopBit = true;
|
||||
}
|
||||
writePeriod(dutyCycle, offCycle, true);
|
||||
if (!m_intTxEnabled) {
|
||||
// restore the interrupt state if applicable
|
||||
restoreInterrupts();
|
||||
}
|
||||
if (m_txEnableValid) {
|
||||
digitalWrite(m_txEnablePin, LOW);
|
||||
}
|
||||
return size;
|
||||
}
|
||||
|
||||
void UARTBase::flush() {
|
||||
if (!m_rxValid) { return; }
|
||||
m_buffer->flush();
|
||||
if (m_parityBuffer)
|
||||
{
|
||||
m_parityInPos = m_parityOutPos = 1;
|
||||
m_parityBuffer->flush();
|
||||
}
|
||||
}
|
||||
|
||||
bool UARTBase::overflow() {
|
||||
bool res = m_overflow;
|
||||
m_overflow = false;
|
||||
return res;
|
||||
}
|
||||
|
||||
int UARTBase::peek() {
|
||||
if (!m_rxValid) { return -1; }
|
||||
if (!m_buffer->available()) {
|
||||
rxBits();
|
||||
if (!m_buffer->available()) return -1;
|
||||
}
|
||||
auto val = m_buffer->peek();
|
||||
if (m_parityBuffer) m_lastReadParity = m_parityBuffer->peek() & m_parityOutPos;
|
||||
return val;
|
||||
}
|
||||
|
||||
void UARTBase::rxBits() {
|
||||
#ifdef ESP8266
|
||||
if (m_isrOverflow.load()) {
|
||||
m_overflow = true;
|
||||
m_isrOverflow.store(false);
|
||||
}
|
||||
#else
|
||||
if (m_isrOverflow.exchange(false)) {
|
||||
m_overflow = true;
|
||||
}
|
||||
#endif
|
||||
|
||||
m_isrBuffer->for_each(m_isrBufferForEachDel);
|
||||
|
||||
// A stop bit can go undetected if leading data bits are at same level
|
||||
// and there was also no next start bit yet, so one word may be pending.
|
||||
// Check that there was no new ISR data received in the meantime, inserting an
|
||||
// extraneous stop level bit out of sequence breaks rx.
|
||||
if (m_rxLastBit < m_pduBits - 1) {
|
||||
const uint32_t detectionTicks = (m_pduBits - 1 - m_rxLastBit) * m_bitTicks;
|
||||
if (!m_isrBuffer->available() && microsToTicks(micros()) - m_isrLastTick > detectionTicks) {
|
||||
// Produce faux stop bit level, prevents start bit maldetection
|
||||
// tick's LSB is repurposed for the level bit
|
||||
rxBits(((m_isrLastTick + detectionTicks) | 1) ^ m_invert);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void UARTBase::rxBits(const uint32_t isrTick) {
|
||||
const bool level = (m_isrLastTick & 1) ^ m_invert;
|
||||
|
||||
// error introduced by edge value in LSB of isrTick is negligible
|
||||
uint32_t ticks = isrTick - m_isrLastTick;
|
||||
m_isrLastTick = isrTick;
|
||||
|
||||
uint32_t bits = ticks / m_bitTicks;
|
||||
if (ticks % m_bitTicks > (m_bitTicks >> 1)) ++bits;
|
||||
while (bits > 0) {
|
||||
// start bit detection
|
||||
if (m_rxLastBit >= (m_pduBits - 1)) {
|
||||
// leading edge of start bit?
|
||||
if (level) break;
|
||||
m_rxLastBit = -1;
|
||||
--bits;
|
||||
continue;
|
||||
}
|
||||
// data bits
|
||||
if (m_rxLastBit < (m_dataBits - 1)) {
|
||||
uint8_t dataBits = min(bits, static_cast<uint32_t>(m_dataBits - 1 - m_rxLastBit));
|
||||
m_rxLastBit += dataBits;
|
||||
bits -= dataBits;
|
||||
m_rxCurByte >>= dataBits;
|
||||
if (level) { m_rxCurByte |= (BYTE_ALL_BITS_SET << (8 - dataBits)); }
|
||||
continue;
|
||||
}
|
||||
// parity bit
|
||||
if (m_parityMode && m_rxLastBit == (m_dataBits - 1)) {
|
||||
++m_rxLastBit;
|
||||
--bits;
|
||||
m_rxCurParity = level;
|
||||
continue;
|
||||
}
|
||||
// stop bits
|
||||
// Store the received value in the buffer unless we have an overflow
|
||||
// if not high stop bit level, discard word
|
||||
if (bits >= static_cast<uint32_t>(m_pduBits - 1 - m_rxLastBit) && level) {
|
||||
m_rxCurByte >>= (sizeof(uint8_t) * 8 - m_dataBits);
|
||||
if (!m_buffer->push(m_rxCurByte)) {
|
||||
m_overflow = true;
|
||||
}
|
||||
else {
|
||||
if (m_parityBuffer)
|
||||
{
|
||||
if (m_rxCurParity) {
|
||||
m_parityBuffer->pushpeek() |= m_parityInPos;
|
||||
}
|
||||
else {
|
||||
m_parityBuffer->pushpeek() &= ~m_parityInPos;
|
||||
}
|
||||
m_parityInPos <<= 1;
|
||||
if (!m_parityInPos)
|
||||
{
|
||||
m_parityBuffer->push();
|
||||
m_parityInPos = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
m_rxLastBit = m_pduBits - 1;
|
||||
// reset to 0 is important for masked bit logic
|
||||
m_rxCurByte = 0;
|
||||
m_rxCurParity = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void IRAM_ATTR UARTBase::rxBitISR(UARTBase* self) {
|
||||
const bool level = *self->m_rxReg & self->m_rxBitMask;
|
||||
const uint32_t curTick = microsToTicks(micros());
|
||||
const bool empty = !self->m_isrBuffer->available();
|
||||
|
||||
// Store level and tick in the buffer unless we have an overflow
|
||||
// tick's LSB is repurposed for the level bit
|
||||
if (!self->m_isrBuffer->push((curTick | 1U) ^ !level)) self->m_isrOverflow.store(true);
|
||||
// Trigger rx callback only when receiver is starved
|
||||
if (empty) self->m_rxHandler();
|
||||
}
|
||||
|
||||
void IRAM_ATTR UARTBase::rxBitSyncISR(UARTBase* self) {
|
||||
bool level = self->m_invert;
|
||||
const uint32_t start = microsToTicks(micros());
|
||||
uint32_t wait = self->m_bitTicks;
|
||||
const bool empty = !self->m_isrBuffer->available();
|
||||
|
||||
// Store level and tick in the buffer unless we have an overflow
|
||||
// tick's LSB is repurposed for the level bit
|
||||
if (!self->m_isrBuffer->push(((start + wait) | 1U) ^ !level)) self->m_isrOverflow.store(true);
|
||||
|
||||
for (uint32_t i = 0; i < self->m_pduBits; ++i) {
|
||||
while (microsToTicks(micros()) - start < wait) {};
|
||||
wait += self->m_bitTicks;
|
||||
|
||||
// Store level and tick in the buffer unless we have an overflow
|
||||
// tick's LSB is repurposed for the level bit
|
||||
if (static_cast<bool>(*self->m_rxReg & self->m_rxBitMask) != level)
|
||||
{
|
||||
if (!self->m_isrBuffer->push(((start + wait) | 1U) ^ level)) self->m_isrOverflow.store(true);
|
||||
level = !level;
|
||||
}
|
||||
}
|
||||
// Trigger rx callback only when receiver is starved
|
||||
if (empty) self->m_rxHandler();
|
||||
}
|
||||
|
||||
void UARTBase::onReceive(const Delegate<void(), void*>& handler) {
|
||||
disableInterrupts();
|
||||
m_rxHandler = handler;
|
||||
restoreInterrupts();
|
||||
}
|
||||
|
||||
void UARTBase::onReceive(Delegate<void(), void*>&& handler) {
|
||||
disableInterrupts();
|
||||
m_rxHandler = std::move(handler);
|
||||
restoreInterrupts();
|
||||
}
|
||||
|
||||
#if __GNUC__ < 12
|
||||
// The template member functions below must be in IRAM, but due to a bug GCC doesn't currently
|
||||
// honor the attribute. Instead, it is possible to do explicit specialization and adorn
|
||||
// these with the IRAM attribute:
|
||||
// Delegate<>::operator (), circular_queue<>::available,
|
||||
// circular_queue<>::available_for_push, circular_queue<>::push_peek, circular_queue<>::push
|
||||
|
||||
template void IRAM_ATTR delegate::detail::DelegateImpl<void*, void>::operator()() const;
|
||||
template size_t IRAM_ATTR circular_queue<uint32_t, UARTBase*>::available() const;
|
||||
template bool IRAM_ATTR circular_queue<uint32_t, UARTBase*>::push(uint32_t&&);
|
||||
template bool IRAM_ATTR circular_queue<uint32_t, UARTBase*>::push(const uint32_t&);
|
||||
#endif // __GNUC__ < 12
|
||||
|
||||
449
lib/EspSoftwareSerial/src/SoftwareSerial.h
Normal file
449
lib/EspSoftwareSerial/src/SoftwareSerial.h
Normal file
@@ -0,0 +1,449 @@
|
||||
/*
|
||||
SoftwareSerial.h - Implementation of the Arduino software serial for ESP8266/ESP32.
|
||||
Copyright (c) 2015-2016 Peter Lerup. All rights reserved.
|
||||
Copyright (c) 2018-2019 Dirk O. Kaar. All rights reserved.
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
This library 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
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
*/
|
||||
|
||||
#ifndef __SoftwareSerial_h
|
||||
#define __SoftwareSerial_h
|
||||
|
||||
#include "circular_queue/circular_queue.h"
|
||||
#include <Stream.h>
|
||||
|
||||
namespace EspSoftwareSerial {
|
||||
|
||||
// Interface definition for template argument of BasicUART
|
||||
class IGpioCapabilities {
|
||||
public:
|
||||
static constexpr bool isValidPin(int8_t pin);
|
||||
static constexpr bool isValidInputPin(int8_t pin);
|
||||
static constexpr bool isValidOutputPin(int8_t pin);
|
||||
// result is only defined for a valid Rx pin
|
||||
static constexpr bool hasPullUp(int8_t pin);
|
||||
};
|
||||
|
||||
class GpioCapabilities : private IGpioCapabilities {
|
||||
public:
|
||||
static constexpr bool isValidPin(int8_t pin) {
|
||||
#if defined(ESP8266)
|
||||
return (pin >= 0 && pin <= 16) && !isFlashInterfacePin(pin);
|
||||
#elif defined(ESP32)
|
||||
// Remove the strapping pins as defined in the datasheets, they affect bootup and other critical operations
|
||||
// Remmove the flash memory pins on related devices, since using these causes memory access issues.
|
||||
#ifdef CONFIG_IDF_TARGET_ESP32
|
||||
// Datasheet https://www.espressif.com/sites/default/files/documentation/esp32_datasheet_en.pdf,
|
||||
// Pinout https://docs.espressif.com/projects/esp-idf/en/latest/esp32/_images/esp32-devkitC-v4-pinout.jpg
|
||||
return (pin == 1) || (pin >= 3 && pin <= 5) ||
|
||||
(pin >= 12 && pin <= 15) ||
|
||||
(!psramFound() && pin >= 16 && pin <= 17) ||
|
||||
(pin >= 18 && pin <= 19) ||
|
||||
(pin >= 21 && pin <= 23) || (pin >= 25 && pin <= 27) || (pin >= 32 && pin <= 39);
|
||||
#elif CONFIG_IDF_TARGET_ESP32S2
|
||||
// Datasheet https://www.espressif.com/sites/default/files/documentation/esp32-s2_datasheet_en.pdf,
|
||||
// Pinout https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/_images/esp32-s2_saola1-pinout.jpg
|
||||
return (pin >= 1 && pin <= 21) || (pin >= 33 && pin <= 44);
|
||||
#elif CONFIG_IDF_TARGET_ESP32C3
|
||||
// Datasheet https://www.espressif.com/sites/default/files/documentation/esp32-c3_datasheet_en.pdf,
|
||||
// Pinout https://docs.espressif.com/projects/esp-idf/en/latest/esp32c3/_images/esp32-c3-devkitm-1-v1-pinout.jpg
|
||||
return (pin >= 0 && pin <= 1) || (pin >= 3 && pin <= 7) || (pin >= 18 && pin <= 21);
|
||||
#else
|
||||
return pin >= 0;
|
||||
#endif
|
||||
#else
|
||||
return pin >= 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
static constexpr bool isValidInputPin(int8_t pin) {
|
||||
return isValidPin(pin)
|
||||
#if defined(ESP8266)
|
||||
&& (pin != 16)
|
||||
#endif
|
||||
;
|
||||
}
|
||||
|
||||
static constexpr bool isValidOutputPin(int8_t pin) {
|
||||
return isValidPin(pin)
|
||||
#if defined(ESP32)
|
||||
#ifdef CONFIG_IDF_TARGET_ESP32
|
||||
&& (pin < 34)
|
||||
#elif CONFIG_IDF_TARGET_ESP32S2
|
||||
&& (pin <= 45)
|
||||
#elif CONFIG_IDF_TARGET_ESP32C3
|
||||
// no restrictions
|
||||
#endif
|
||||
#endif
|
||||
;
|
||||
}
|
||||
|
||||
// result is only defined for a valid Rx pin
|
||||
static constexpr bool hasPullUp(int8_t pin) {
|
||||
#if defined(ESP32)
|
||||
return !(pin >= 34 && pin <= 39);
|
||||
#else
|
||||
(void)pin;
|
||||
return true;
|
||||
#endif
|
||||
}
|
||||
};
|
||||
|
||||
enum Parity : uint8_t {
|
||||
PARITY_NONE = 000,
|
||||
PARITY_EVEN = 020,
|
||||
PARITY_ODD = 030,
|
||||
PARITY_MARK = 040,
|
||||
PARITY_SPACE = 070,
|
||||
};
|
||||
|
||||
enum Config {
|
||||
SWSERIAL_5N1 = PARITY_NONE,
|
||||
SWSERIAL_6N1,
|
||||
SWSERIAL_7N1,
|
||||
SWSERIAL_8N1,
|
||||
SWSERIAL_5E1 = PARITY_EVEN,
|
||||
SWSERIAL_6E1,
|
||||
SWSERIAL_7E1,
|
||||
SWSERIAL_8E1,
|
||||
SWSERIAL_5O1 = PARITY_ODD,
|
||||
SWSERIAL_6O1,
|
||||
SWSERIAL_7O1,
|
||||
SWSERIAL_8O1,
|
||||
SWSERIAL_5M1 = PARITY_MARK,
|
||||
SWSERIAL_6M1,
|
||||
SWSERIAL_7M1,
|
||||
SWSERIAL_8M1,
|
||||
SWSERIAL_5S1 = PARITY_SPACE,
|
||||
SWSERIAL_6S1,
|
||||
SWSERIAL_7S1,
|
||||
SWSERIAL_8S1,
|
||||
SWSERIAL_5N2 = 0200 | PARITY_NONE,
|
||||
SWSERIAL_6N2,
|
||||
SWSERIAL_7N2,
|
||||
SWSERIAL_8N2,
|
||||
SWSERIAL_5E2 = 0200 | PARITY_EVEN,
|
||||
SWSERIAL_6E2,
|
||||
SWSERIAL_7E2,
|
||||
SWSERIAL_8E2,
|
||||
SWSERIAL_5O2 = 0200 | PARITY_ODD,
|
||||
SWSERIAL_6O2,
|
||||
SWSERIAL_7O2,
|
||||
SWSERIAL_8O2,
|
||||
SWSERIAL_5M2 = 0200 | PARITY_MARK,
|
||||
SWSERIAL_6M2,
|
||||
SWSERIAL_7M2,
|
||||
SWSERIAL_8M2,
|
||||
SWSERIAL_5S2 = 0200 | PARITY_SPACE,
|
||||
SWSERIAL_6S2,
|
||||
SWSERIAL_7S2,
|
||||
SWSERIAL_8S2,
|
||||
};
|
||||
|
||||
/// This class is compatible with the corresponding AVR one, however,
|
||||
/// the constructor takes no arguments, for compatibility with the
|
||||
/// HardwareSerial class.
|
||||
/// Instead, the begin() function handles pin assignments and logic inversion.
|
||||
/// It also has optional input buffer capacity arguments for byte buffer and ISR bit buffer.
|
||||
/// Bitrates up to at least 115200 can be used.
|
||||
class UARTBase : public Stream {
|
||||
public:
|
||||
UARTBase();
|
||||
/// Ctor to set defaults for pins.
|
||||
/// @param rxPin the GPIO pin used for RX
|
||||
/// @param txPin -1 for onewire protocol, GPIO pin used for twowire TX
|
||||
UARTBase(int8_t rxPin, int8_t txPin = -1, bool invert = false);
|
||||
UARTBase(const UARTBase&) = delete;
|
||||
UARTBase& operator= (const UARTBase&) = delete;
|
||||
virtual ~UARTBase();
|
||||
/// Configure the UARTBase object for use.
|
||||
/// @param baud the TX/RX bitrate
|
||||
/// @param config sets databits, parity, and stop bit count
|
||||
/// @param rxPin -1 or default: either no RX pin, or keeps the rxPin set in the ctor
|
||||
/// @param txPin -1 or default: either no TX pin (onewire), or keeps the txPin set in the ctor
|
||||
/// @param invert true: uses invert line level logic
|
||||
/// @param bufCapacity the capacity for the received bytes buffer
|
||||
/// @param isrBufCapacity 0: derived from bufCapacity. The capacity of the internal asynchronous
|
||||
/// bit receive buffer, a suggested size is bufCapacity times the sum of
|
||||
/// start, data, parity and stop bit count.
|
||||
void begin(uint32_t baud, Config config,
|
||||
int8_t rxPin, int8_t txPin, bool invert);
|
||||
|
||||
uint32_t baudRate();
|
||||
/// Transmit control pin.
|
||||
void setTransmitEnablePin(int8_t txEnablePin);
|
||||
/// Enable (default) or disable interrupts during tx.
|
||||
void enableIntTx(bool on);
|
||||
/// Enable (default) or disable internal rx GPIO pull-up.
|
||||
void enableRxGPIOPullUp(bool on);
|
||||
/// Enable or disable (default) tx GPIO output mode.
|
||||
void enableTxGPIOOpenDrain(bool on);
|
||||
|
||||
bool overflow();
|
||||
|
||||
int available() override;
|
||||
#if defined(ESP8266)
|
||||
int availableForWrite() override {
|
||||
#else
|
||||
int availableForWrite() {
|
||||
#endif
|
||||
if (!m_txValid) return 0;
|
||||
return 1;
|
||||
}
|
||||
int peek() override;
|
||||
int read() override;
|
||||
/// @returns The verbatim parity bit associated with the last successful read() or peek() call
|
||||
bool readParity()
|
||||
{
|
||||
return m_lastReadParity;
|
||||
}
|
||||
/// @returns The calculated bit for even parity of the parameter byte
|
||||
static bool parityEven(uint8_t byte) {
|
||||
byte ^= byte >> 4;
|
||||
byte &= 0xf;
|
||||
return (0x6996 >> byte) & 1;
|
||||
}
|
||||
/// @returns The calculated bit for odd parity of the parameter byte
|
||||
static bool parityOdd(uint8_t byte) {
|
||||
byte ^= byte >> 4;
|
||||
byte &= 0xf;
|
||||
return (0x9669 >> byte) & 1;
|
||||
}
|
||||
/// The read(buffer, size) functions are non-blocking, the same as readBytes but without timeout
|
||||
int read(uint8_t* buffer, size_t size)
|
||||
#if defined(ESP8266)
|
||||
override
|
||||
#endif
|
||||
;
|
||||
/// The read(buffer, size) functions are non-blocking, the same as readBytes but without timeout
|
||||
int read(char* buffer, size_t size) {
|
||||
return read(reinterpret_cast<uint8_t*>(buffer), size);
|
||||
}
|
||||
/// @returns The number of bytes read into buffer, up to size. Times out if the limit set through
|
||||
/// Stream::setTimeout() is reached.
|
||||
size_t readBytes(uint8_t* buffer, size_t size) override;
|
||||
/// @returns The number of bytes read into buffer, up to size. Times out if the limit set through
|
||||
/// Stream::setTimeout() is reached.
|
||||
size_t readBytes(char* buffer, size_t size) override {
|
||||
return readBytes(reinterpret_cast<uint8_t*>(buffer), size);
|
||||
}
|
||||
void flush() override;
|
||||
size_t write(uint8_t byte) override;
|
||||
size_t write(uint8_t byte, Parity parity);
|
||||
size_t write(const uint8_t* buffer, size_t size) override;
|
||||
size_t write(const char* buffer, size_t size) {
|
||||
return write(reinterpret_cast<const uint8_t*>(buffer), size);
|
||||
}
|
||||
size_t write(const uint8_t* buffer, size_t size, Parity parity);
|
||||
size_t write(const char* buffer, size_t size, Parity parity) {
|
||||
return write(reinterpret_cast<const uint8_t*>(buffer), size, parity);
|
||||
}
|
||||
operator bool() const {
|
||||
return (-1 == m_rxPin || m_rxValid) && (-1 == m_txPin || m_txValid) && !(-1 == m_rxPin && m_oneWire);
|
||||
}
|
||||
|
||||
/// Disable or enable interrupts on the rx pin.
|
||||
void enableRx(bool on);
|
||||
/// One wire control.
|
||||
void enableTx(bool on);
|
||||
|
||||
// AVR compatibility methods.
|
||||
bool listen() { enableRx(true); return true; }
|
||||
void end();
|
||||
bool isListening() { return m_rxEnabled; }
|
||||
bool stopListening() { enableRx(false); return true; }
|
||||
|
||||
/// onReceive sets a callback that will be called in interrupt context
|
||||
/// when data is received.
|
||||
/// More precisely, the callback is triggered when UARTBase detects
|
||||
/// a new reception, which may not yet have completed on invocation.
|
||||
/// Reading - never from this interrupt context - should therefore be
|
||||
/// delayed at least for the duration of one incoming word.
|
||||
void onReceive(const Delegate<void(), void*>& handler);
|
||||
/// onReceive sets a callback that will be called in interrupt context
|
||||
/// when data is received.
|
||||
/// More precisely, the callback is triggered when UARTBase detects
|
||||
/// a new reception, which may not yet have completed on invocation.
|
||||
/// Reading - never from this interrupt context - should therefore be
|
||||
/// delayed at least for the duration of one incoming word.
|
||||
void onReceive(Delegate<void(), void*>&& handler);
|
||||
|
||||
[[deprecated("function removed; semantics of onReceive() changed; check the header file.")]]
|
||||
void perform_work();
|
||||
|
||||
using Print::write;
|
||||
|
||||
protected:
|
||||
void beginRx(bool hasPullUp, int bufCapacity, int isrBufCapacity);
|
||||
void beginTx();
|
||||
// Member variables
|
||||
int8_t m_rxPin = -1;
|
||||
int8_t m_txPin = -1;
|
||||
bool m_invert = false;
|
||||
|
||||
private:
|
||||
// It's legal to exceed the deadline, for instance,
|
||||
// by enabling interrupts.
|
||||
void lazyDelay();
|
||||
// Synchronous precise delay
|
||||
void preciseDelay();
|
||||
// If withStopBit is set, either cycle contains a stop bit.
|
||||
// If dutyCycle == 0, the level is not forced to HIGH.
|
||||
// If offCycle == 0, the level remains unchanged from dutyCycle.
|
||||
void writePeriod(
|
||||
uint32_t dutyCycle, uint32_t offCycle, bool withStopBit);
|
||||
// safely set the pin mode for the Rx GPIO pin
|
||||
void setRxGPIOPinMode();
|
||||
// safely set the pin mode for the Tx GPIO pin
|
||||
void setTxGPIOPinMode();
|
||||
/* check m_rxValid that calling is safe */
|
||||
void rxBits();
|
||||
void rxBits(const uint32_t isrTick);
|
||||
static void disableInterrupts();
|
||||
static void restoreInterrupts();
|
||||
|
||||
static void rxBitISR(UARTBase* self);
|
||||
static void rxBitSyncISR(UARTBase* self);
|
||||
|
||||
static inline uint32_t IRAM_ATTR microsToTicks(uint32_t micros) ALWAYS_INLINE_ATTR {
|
||||
return micros << 1;
|
||||
}
|
||||
static inline uint32_t ticksToMicros(uint32_t ticks) ALWAYS_INLINE_ATTR {
|
||||
return ticks >> 1;
|
||||
}
|
||||
|
||||
// Member variables
|
||||
volatile uint32_t* m_rxReg;
|
||||
uint32_t m_rxBitMask;
|
||||
#if !defined(ESP8266)
|
||||
volatile uint32_t* m_txReg;
|
||||
#endif
|
||||
uint32_t m_txBitMask;
|
||||
int8_t m_txEnablePin = -1;
|
||||
uint8_t m_dataBits;
|
||||
bool m_oneWire;
|
||||
bool m_rxValid = false;
|
||||
bool m_rxEnabled = false;
|
||||
bool m_txValid = false;
|
||||
bool m_txEnableValid = false;
|
||||
/// PDU bits include data, parity and stop bits; the start bit is not counted.
|
||||
uint8_t m_pduBits;
|
||||
bool m_intTxEnabled;
|
||||
bool m_rxGPIOHasPullUp = false;
|
||||
bool m_rxGPIOPullUpEnabled = true;
|
||||
bool m_txGPIOOpenDrain = false;
|
||||
Parity m_parityMode;
|
||||
uint8_t m_stopBits;
|
||||
bool m_lastReadParity;
|
||||
bool m_overflow = false;
|
||||
uint32_t m_bitTicks;
|
||||
uint8_t m_parityInPos;
|
||||
uint8_t m_parityOutPos;
|
||||
int8_t m_rxLastBit; // 0 thru (m_pduBits - m_stopBits - 1): data/parity bits. -1: start bit. (m_pduBits - 1): stop bit.
|
||||
uint8_t m_rxCurByte = 0;
|
||||
std::unique_ptr<circular_queue<uint8_t> > m_buffer;
|
||||
std::unique_ptr<circular_queue<uint8_t> > m_parityBuffer;
|
||||
uint32_t m_periodStart;
|
||||
uint32_t m_periodDuration;
|
||||
#ifndef ESP32
|
||||
static uint32_t m_savedPS;
|
||||
#else
|
||||
static portMUX_TYPE m_interruptsMux;
|
||||
#endif
|
||||
// the ISR stores the relative bit times in the buffer. The inversion corrected level is used as sign bit (2's complement):
|
||||
// 1 = positive including 0, 0 = negative.
|
||||
std::unique_ptr<circular_queue<uint32_t, UARTBase*> > m_isrBuffer;
|
||||
const Delegate<void(uint32_t&&), UARTBase*> m_isrBufferForEachDel { [](UARTBase* self, uint32_t&& isrTick) { self->rxBits(isrTick); }, this };
|
||||
std::atomic<bool> m_isrOverflow { false };
|
||||
uint32_t m_isrLastTick;
|
||||
bool m_rxCurParity = false;
|
||||
Delegate<void(), void*> m_rxHandler;
|
||||
};
|
||||
|
||||
template< class GpioCapabilities > class BasicUART : public UARTBase {
|
||||
static_assert(std::is_base_of<IGpioCapabilities, GpioCapabilities>::value,
|
||||
"template argument is not derived from IGpioCapabilities");
|
||||
public:
|
||||
BasicUART() : UARTBase() {
|
||||
}
|
||||
/// Ctor to set defaults for pins.
|
||||
/// @param rxPin the GPIO pin used for RX
|
||||
/// @param txPin -1 for onewire protocol, GPIO pin used for twowire TX
|
||||
BasicUART(int8_t rxPin, int8_t txPin = -1, bool invert = false) :
|
||||
UARTBase(rxPin, txPin, invert) {
|
||||
}
|
||||
|
||||
/// Configure the BasicUART object for use.
|
||||
/// @param baud the TX/RX bitrate
|
||||
/// @param config sets databits, parity, and stop bit count
|
||||
/// @param rxPin -1 or default: either no RX pin, or keeps the rxPin set in the ctor
|
||||
/// @param txPin -1 or default: either no TX pin (onewire), or keeps the txPin set in the ctor
|
||||
/// @param invert true: uses invert line level logic
|
||||
/// @param bufCapacity the capacity for the received bytes buffer
|
||||
/// @param isrBufCapacity 0: derived from bufCapacity. The capacity of the internal asynchronous
|
||||
/// bit receive buffer, a suggested size is bufCapacity times the sum of
|
||||
/// start, data, parity and stop bit count.
|
||||
void begin(uint32_t baud, Config config,
|
||||
int8_t rxPin, int8_t txPin, bool invert,
|
||||
int bufCapacity = 64, int isrBufCapacity = 0) {
|
||||
UARTBase::begin(baud, config, rxPin, txPin, invert);
|
||||
if (GpioCapabilities::isValidInputPin(rxPin)) {
|
||||
beginRx(GpioCapabilities:: hasPullUp(rxPin), bufCapacity, isrBufCapacity);
|
||||
}
|
||||
if (GpioCapabilities::isValidOutputPin(txPin)) {
|
||||
beginTx();
|
||||
}
|
||||
enableRx(true);
|
||||
}
|
||||
void begin(uint32_t baud, Config config,
|
||||
int8_t rxPin, int8_t txPin) {
|
||||
begin(baud, config, rxPin, txPin, m_invert);
|
||||
}
|
||||
void begin(uint32_t baud, Config config,
|
||||
int8_t rxPin) {
|
||||
begin(baud, config, rxPin, m_txPin, m_invert);
|
||||
}
|
||||
void begin(uint32_t baud, Config config = SWSERIAL_8N1) {
|
||||
begin(baud, config, m_rxPin, m_txPin, m_invert);
|
||||
}
|
||||
void setTransmitEnablePin(int8_t txEnablePin) {
|
||||
UARTBase::setTransmitEnablePin(
|
||||
GpioCapabilities::isValidOutputPin(txEnablePin) ? txEnablePin : -1);
|
||||
}
|
||||
};
|
||||
|
||||
using UART = BasicUART< GpioCapabilities >;
|
||||
|
||||
}; // namespace EspSoftwareSerial
|
||||
|
||||
using SoftwareSerial = EspSoftwareSerial::UART;
|
||||
using namespace EspSoftwareSerial;
|
||||
|
||||
#if __GNUC__ < 12
|
||||
// The template member functions below must be in IRAM, but due to a bug GCC doesn't currently
|
||||
// honor the attribute. Instead, it is possible to do explicit specialization and adorn
|
||||
// these with the IRAM attribute:
|
||||
// Delegate<>::operator (), circular_queue<>::available,
|
||||
// circular_queue<>::available_for_push, circular_queue<>::push_peek, circular_queue<>::push
|
||||
|
||||
extern template void delegate::detail::DelegateImpl<void*, void>::operator()() const;
|
||||
extern template size_t circular_queue<uint32_t, EspSoftwareSerial::UARTBase*>::available() const;
|
||||
extern template bool circular_queue<uint32_t, EspSoftwareSerial::UARTBase*>::push(uint32_t&&);
|
||||
extern template bool circular_queue<uint32_t, EspSoftwareSerial::UARTBase*>::push(const uint32_t&);
|
||||
#endif // __GNUC__ < 12
|
||||
|
||||
#endif // __SoftwareSerial_h
|
||||
|
||||
2209
lib/EspSoftwareSerial/src/circular_queue/Delegate.h
Normal file
2209
lib/EspSoftwareSerial/src/circular_queue/Delegate.h
Normal file
File diff suppressed because it is too large
Load Diff
567
lib/EspSoftwareSerial/src/circular_queue/MultiDelegate.h
Normal file
567
lib/EspSoftwareSerial/src/circular_queue/MultiDelegate.h
Normal file
@@ -0,0 +1,567 @@
|
||||
/*
|
||||
MultiDelegate.h - A queue or event multiplexer based on the efficient Delegate
|
||||
class
|
||||
Copyright (c) 2019-2020 Dirk O. Kaar. All rights reserved.
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
This library 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
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#ifndef __MULTIDELEGATE_H
|
||||
#define __MULTIDELEGATE_H
|
||||
|
||||
#include <iterator>
|
||||
#if defined(ESP8266) || defined(ESP32) || !defined(ARDUINO)
|
||||
#include <atomic>
|
||||
#else
|
||||
#include "circular_queue/ghostl.h"
|
||||
#endif
|
||||
|
||||
#if defined(ESP8266)
|
||||
#include <interrupts.h>
|
||||
using esp8266::InterruptLock;
|
||||
#elif defined(ARDUINO)
|
||||
class InterruptLock {
|
||||
public:
|
||||
InterruptLock() {
|
||||
noInterrupts();
|
||||
}
|
||||
~InterruptLock() {
|
||||
interrupts();
|
||||
}
|
||||
};
|
||||
#else
|
||||
#include <mutex>
|
||||
#endif
|
||||
|
||||
namespace
|
||||
{
|
||||
|
||||
template< typename Delegate, typename R, bool ISQUEUE = false, typename... P>
|
||||
struct CallP
|
||||
{
|
||||
static R execute(Delegate& del, P... args)
|
||||
{
|
||||
return del(std::forward<P...>(args...));
|
||||
}
|
||||
};
|
||||
|
||||
template< typename Delegate, bool ISQUEUE, typename... P>
|
||||
struct CallP<Delegate, void, ISQUEUE, P...>
|
||||
{
|
||||
static bool execute(Delegate& del, P... args)
|
||||
{
|
||||
del(std::forward<P...>(args...));
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
template< typename Delegate, typename R, bool ISQUEUE = false>
|
||||
struct Call
|
||||
{
|
||||
static R execute(Delegate& del)
|
||||
{
|
||||
return del();
|
||||
}
|
||||
};
|
||||
|
||||
template< typename Delegate, bool ISQUEUE>
|
||||
struct Call<Delegate, void, ISQUEUE>
|
||||
{
|
||||
static bool execute(Delegate& del)
|
||||
{
|
||||
del();
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
namespace delegate
|
||||
{
|
||||
namespace detail
|
||||
{
|
||||
|
||||
template< typename Delegate, typename R, bool ISQUEUE = false, size_t QUEUE_CAPACITY = 32, typename... P>
|
||||
class MultiDelegatePImpl
|
||||
{
|
||||
public:
|
||||
MultiDelegatePImpl() = default;
|
||||
~MultiDelegatePImpl()
|
||||
{
|
||||
*this = nullptr;
|
||||
}
|
||||
|
||||
MultiDelegatePImpl(const MultiDelegatePImpl&) = delete;
|
||||
MultiDelegatePImpl& operator=(const MultiDelegatePImpl&) = delete;
|
||||
|
||||
MultiDelegatePImpl(MultiDelegatePImpl&& md)
|
||||
{
|
||||
first = md.first;
|
||||
last = md.last;
|
||||
unused = md.unused;
|
||||
nodeCount = md.nodeCount;
|
||||
md.first = nullptr;
|
||||
md.last = nullptr;
|
||||
md.unused = nullptr;
|
||||
md.nodeCount = 0;
|
||||
}
|
||||
|
||||
MultiDelegatePImpl(const Delegate& del)
|
||||
{
|
||||
add(del);
|
||||
}
|
||||
|
||||
MultiDelegatePImpl(Delegate&& del)
|
||||
{
|
||||
add(std::move(del));
|
||||
}
|
||||
|
||||
MultiDelegatePImpl& operator=(MultiDelegatePImpl&& md)
|
||||
{
|
||||
first = md.first;
|
||||
last = md.last;
|
||||
unused = md.unused;
|
||||
nodeCount = md.nodeCount;
|
||||
md.first = nullptr;
|
||||
md.last = nullptr;
|
||||
md.unused = nullptr;
|
||||
md.nodeCount = 0;
|
||||
return *this;
|
||||
}
|
||||
|
||||
MultiDelegatePImpl& operator=(std::nullptr_t)
|
||||
{
|
||||
if (last)
|
||||
last->mNext = unused;
|
||||
if (first)
|
||||
unused = first;
|
||||
while (unused)
|
||||
{
|
||||
auto to_delete = unused;
|
||||
unused = unused->mNext;
|
||||
delete(to_delete);
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
|
||||
MultiDelegatePImpl& operator+=(const Delegate& del)
|
||||
{
|
||||
add(del);
|
||||
return *this;
|
||||
}
|
||||
|
||||
MultiDelegatePImpl& operator+=(Delegate&& del)
|
||||
{
|
||||
add(std::move(del));
|
||||
return *this;
|
||||
}
|
||||
|
||||
protected:
|
||||
struct Node_t
|
||||
{
|
||||
~Node_t()
|
||||
{
|
||||
mDelegate = nullptr; // special overload in Delegate
|
||||
}
|
||||
Node_t* mNext = nullptr;
|
||||
Delegate mDelegate;
|
||||
};
|
||||
|
||||
Node_t* first = nullptr;
|
||||
Node_t* last = nullptr;
|
||||
Node_t* unused = nullptr;
|
||||
size_t nodeCount = 0;
|
||||
|
||||
// Returns a pointer to an unused Node_t,
|
||||
// or if none are available allocates a new one,
|
||||
// or nullptr if limit is reached
|
||||
Node_t* IRAM_ATTR get_node_unsafe()
|
||||
{
|
||||
Node_t* result = nullptr;
|
||||
// try to get an item from unused items list
|
||||
if (unused)
|
||||
{
|
||||
result = unused;
|
||||
unused = unused->mNext;
|
||||
}
|
||||
// if no unused items, and count not too high, allocate a new one
|
||||
else if (nodeCount < QUEUE_CAPACITY)
|
||||
{
|
||||
#if defined(ESP8266) || defined(ESP32)
|
||||
result = new (std::nothrow) Node_t;
|
||||
#else
|
||||
result = new Node_t;
|
||||
#endif
|
||||
if (result)
|
||||
++nodeCount;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
void recycle_node_unsafe(Node_t* node)
|
||||
{
|
||||
node->mDelegate = nullptr; // special overload in Delegate
|
||||
node->mNext = unused;
|
||||
unused = node;
|
||||
}
|
||||
|
||||
#ifndef ARDUINO
|
||||
std::mutex mutex_unused;
|
||||
#endif
|
||||
public:
|
||||
class iterator : public std::iterator<std::forward_iterator_tag, Delegate>
|
||||
{
|
||||
public:
|
||||
Node_t* current = nullptr;
|
||||
Node_t* prev = nullptr;
|
||||
const Node_t* stop = nullptr;
|
||||
|
||||
iterator(MultiDelegatePImpl& md) : current(md.first), stop(md.last) {}
|
||||
iterator() = default;
|
||||
iterator(const iterator&) = default;
|
||||
iterator& operator=(const iterator&) = default;
|
||||
iterator& operator=(iterator&&) = default;
|
||||
operator bool() const
|
||||
{
|
||||
return current && stop;
|
||||
}
|
||||
bool operator==(const iterator& rhs) const
|
||||
{
|
||||
return current == rhs.current;
|
||||
}
|
||||
bool operator!=(const iterator& rhs) const
|
||||
{
|
||||
return !operator==(rhs);
|
||||
}
|
||||
Delegate& operator*() const
|
||||
{
|
||||
return current->mDelegate;
|
||||
}
|
||||
Delegate* operator->() const
|
||||
{
|
||||
return ¤t->mDelegate;
|
||||
}
|
||||
iterator& operator++() // prefix
|
||||
{
|
||||
if (current && stop != current)
|
||||
{
|
||||
prev = current;
|
||||
current = current->mNext;
|
||||
}
|
||||
else
|
||||
current = nullptr; // end
|
||||
return *this;
|
||||
}
|
||||
iterator& operator++(int) // postfix
|
||||
{
|
||||
iterator tmp(*this);
|
||||
operator++();
|
||||
return tmp;
|
||||
}
|
||||
};
|
||||
|
||||
iterator begin()
|
||||
{
|
||||
return iterator(*this);
|
||||
}
|
||||
iterator end() const
|
||||
{
|
||||
return iterator();
|
||||
}
|
||||
|
||||
const Delegate* add(const Delegate& del)
|
||||
{
|
||||
return add(Delegate(del));
|
||||
}
|
||||
|
||||
const Delegate* add(Delegate&& del)
|
||||
{
|
||||
if (!del)
|
||||
return nullptr;
|
||||
|
||||
#ifdef ARDUINO
|
||||
InterruptLock lockAllInterruptsInThisScope;
|
||||
#else
|
||||
std::lock_guard<std::mutex> lock(mutex_unused);
|
||||
#endif
|
||||
|
||||
Node_t* item = ISQUEUE ? get_node_unsafe() :
|
||||
#if defined(ESP8266) || defined(ESP32)
|
||||
new (std::nothrow) Node_t;
|
||||
#else
|
||||
new Node_t;
|
||||
#endif
|
||||
if (!item)
|
||||
return nullptr;
|
||||
|
||||
item->mDelegate = std::move(del);
|
||||
item->mNext = nullptr;
|
||||
|
||||
if (last)
|
||||
last->mNext = item;
|
||||
else
|
||||
first = item;
|
||||
last = item;
|
||||
|
||||
return &item->mDelegate;
|
||||
}
|
||||
|
||||
iterator erase(iterator it)
|
||||
{
|
||||
if (!it)
|
||||
return end();
|
||||
#ifdef ARDUINO
|
||||
InterruptLock lockAllInterruptsInThisScope;
|
||||
#else
|
||||
std::lock_guard<std::mutex> lock(mutex_unused);
|
||||
#endif
|
||||
auto to_recycle = it.current;
|
||||
|
||||
if (last == it.current)
|
||||
last = it.prev;
|
||||
it.current = it.current->mNext;
|
||||
if (it.prev)
|
||||
{
|
||||
it.prev->mNext = it.current;
|
||||
}
|
||||
else
|
||||
{
|
||||
first = it.current;
|
||||
}
|
||||
if (ISQUEUE)
|
||||
recycle_node_unsafe(to_recycle);
|
||||
else
|
||||
delete to_recycle;
|
||||
return it;
|
||||
}
|
||||
|
||||
bool erase(const Delegate* const del)
|
||||
{
|
||||
auto it = begin();
|
||||
while (it)
|
||||
{
|
||||
if (del == &(*it))
|
||||
{
|
||||
erase(it);
|
||||
return true;
|
||||
}
|
||||
++it;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
operator bool() const
|
||||
{
|
||||
return first;
|
||||
}
|
||||
|
||||
R operator()(P... args)
|
||||
{
|
||||
auto it = begin();
|
||||
if (!it)
|
||||
return {};
|
||||
|
||||
static std::atomic<bool> fence(false);
|
||||
// prevent recursive calls
|
||||
#if defined(ARDUINO) && !defined(ESP32)
|
||||
if (fence.load()) return {};
|
||||
fence.store(true);
|
||||
#else
|
||||
if (fence.exchange(true)) return {};
|
||||
#endif
|
||||
|
||||
R result;
|
||||
do
|
||||
{
|
||||
result = CallP<Delegate, R, ISQUEUE, P...>::execute(*it, args...);
|
||||
if (result && ISQUEUE)
|
||||
it = erase(it);
|
||||
else
|
||||
++it;
|
||||
#if defined(ESP8266) || defined(ESP32)
|
||||
// running callbacks might last too long for watchdog etc.
|
||||
optimistic_yield(10000);
|
||||
#endif
|
||||
} while (it);
|
||||
|
||||
fence.store(false);
|
||||
return result;
|
||||
}
|
||||
};
|
||||
|
||||
template< typename Delegate, typename R = void, bool ISQUEUE = false, size_t QUEUE_CAPACITY = 32>
|
||||
class MultiDelegateImpl : public MultiDelegatePImpl<Delegate, R, ISQUEUE, QUEUE_CAPACITY>
|
||||
{
|
||||
public:
|
||||
using MultiDelegatePImpl<Delegate, R, ISQUEUE, QUEUE_CAPACITY>::MultiDelegatePImpl;
|
||||
|
||||
R operator()()
|
||||
{
|
||||
auto it = this->begin();
|
||||
if (!it)
|
||||
return {};
|
||||
|
||||
static std::atomic<bool> fence(false);
|
||||
// prevent recursive calls
|
||||
#if defined(ARDUINO) && !defined(ESP32)
|
||||
if (fence.load()) return {};
|
||||
fence.store(true);
|
||||
#else
|
||||
if (fence.exchange(true)) return {};
|
||||
#endif
|
||||
|
||||
R result;
|
||||
do
|
||||
{
|
||||
result = Call<Delegate, R, ISQUEUE>::execute(*it);
|
||||
if (result && ISQUEUE)
|
||||
it = this->erase(it);
|
||||
else
|
||||
++it;
|
||||
#if defined(ESP8266) || defined(ESP32)
|
||||
// running callbacks might last too long for watchdog etc.
|
||||
optimistic_yield(10000);
|
||||
#endif
|
||||
} while (it);
|
||||
|
||||
fence.store(false);
|
||||
return result;
|
||||
}
|
||||
};
|
||||
|
||||
template< typename Delegate, typename R, bool ISQUEUE, size_t QUEUE_CAPACITY, typename... P> class MultiDelegate;
|
||||
|
||||
template< typename Delegate, typename R, bool ISQUEUE, size_t QUEUE_CAPACITY, typename... P>
|
||||
class MultiDelegate<Delegate, R(P...), ISQUEUE, QUEUE_CAPACITY> : public MultiDelegatePImpl<Delegate, R, ISQUEUE, QUEUE_CAPACITY, P...>
|
||||
{
|
||||
public:
|
||||
using MultiDelegatePImpl<Delegate, R, ISQUEUE, QUEUE_CAPACITY, P...>::MultiDelegatePImpl;
|
||||
};
|
||||
|
||||
template< typename Delegate, typename R, bool ISQUEUE, size_t QUEUE_CAPACITY>
|
||||
class MultiDelegate<Delegate, R(), ISQUEUE, QUEUE_CAPACITY> : public MultiDelegateImpl<Delegate, R, ISQUEUE, QUEUE_CAPACITY>
|
||||
{
|
||||
public:
|
||||
using MultiDelegateImpl<Delegate, R, ISQUEUE, QUEUE_CAPACITY>::MultiDelegateImpl;
|
||||
};
|
||||
|
||||
template< typename Delegate, bool ISQUEUE, size_t QUEUE_CAPACITY, typename... P>
|
||||
class MultiDelegate<Delegate, void(P...), ISQUEUE, QUEUE_CAPACITY> : public MultiDelegatePImpl<Delegate, void, ISQUEUE, QUEUE_CAPACITY, P...>
|
||||
{
|
||||
public:
|
||||
using MultiDelegatePImpl<Delegate, void, ISQUEUE, QUEUE_CAPACITY, P...>::MultiDelegatePImpl;
|
||||
|
||||
void operator()(P... args)
|
||||
{
|
||||
auto it = this->begin();
|
||||
if (!it)
|
||||
return;
|
||||
|
||||
static std::atomic<bool> fence(false);
|
||||
// prevent recursive calls
|
||||
#if defined(ARDUINO) && !defined(ESP32)
|
||||
if (fence.load()) return;
|
||||
fence.store(true);
|
||||
#else
|
||||
if (fence.exchange(true)) return;
|
||||
#endif
|
||||
|
||||
do
|
||||
{
|
||||
CallP<Delegate, void, ISQUEUE, P...>::execute(*it, args...);
|
||||
if (ISQUEUE)
|
||||
it = this->erase(it);
|
||||
else
|
||||
++it;
|
||||
#if defined(ESP8266) || defined(ESP32)
|
||||
// running callbacks might last too long for watchdog etc.
|
||||
optimistic_yield(10000);
|
||||
#endif
|
||||
} while (it);
|
||||
|
||||
fence.store(false);
|
||||
}
|
||||
};
|
||||
|
||||
template< typename Delegate, bool ISQUEUE, size_t QUEUE_CAPACITY>
|
||||
class MultiDelegate<Delegate, void(), ISQUEUE, QUEUE_CAPACITY> : public MultiDelegateImpl<Delegate, void, ISQUEUE, QUEUE_CAPACITY>
|
||||
{
|
||||
public:
|
||||
using MultiDelegateImpl<Delegate, void, ISQUEUE, QUEUE_CAPACITY>::MultiDelegateImpl;
|
||||
|
||||
void operator()()
|
||||
{
|
||||
auto it = this->begin();
|
||||
if (!it)
|
||||
return;
|
||||
|
||||
static std::atomic<bool> fence(false);
|
||||
// prevent recursive calls
|
||||
#if defined(ARDUINO) && !defined(ESP32)
|
||||
if (fence.load()) return;
|
||||
fence.store(true);
|
||||
#else
|
||||
if (fence.exchange(true)) return;
|
||||
#endif
|
||||
|
||||
do
|
||||
{
|
||||
Call<Delegate, void, ISQUEUE>::execute(*it);
|
||||
if (ISQUEUE)
|
||||
it = this->erase(it);
|
||||
else
|
||||
++it;
|
||||
#if defined(ESP8266) || defined(ESP32)
|
||||
// running callbacks might last too long for watchdog etc.
|
||||
optimistic_yield(10000);
|
||||
#endif
|
||||
} while (it);
|
||||
|
||||
fence.store(false);
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
The MultiDelegate class template can be specialized to either a queue or an event multiplexer.
|
||||
It is designed to be used with Delegate, the efficient runtime wrapper for C function ptr and C++ std::function.
|
||||
@tparam Delegate specifies the concrete type that MultiDelegate bases the queue or event multiplexer on.
|
||||
@tparam ISQUEUE modifies the generated MultiDelegate class in subtle ways. In queue mode (ISQUEUE == true),
|
||||
the value of QUEUE_CAPACITY enforces the maximum number of simultaneous items the queue can contain.
|
||||
This is exploited to minimize the use of new and delete by reusing already allocated items, thus
|
||||
reducing heap fragmentation. In event multiplexer mode (ISQUEUE = false), new and delete are
|
||||
used for allocation of the event handler items.
|
||||
If the result type of the function call operator of Delegate is void, calling a MultiDelegate queue
|
||||
removes each item after calling it; a Multidelegate event multiplexer keeps event handlers until
|
||||
explicitly removed.
|
||||
If the result type of the function call operator of Delegate is non-void, in a MultiDelegate queue
|
||||
the type-conversion to bool of that result determines if the item is immediately removed or kept
|
||||
after each call: if true is returned, the item is removed. A Multidelegate event multiplexer keeps event
|
||||
handlers until they are explicitly removed.
|
||||
@tparam QUEUE_CAPACITY is only used if ISQUEUE == true. Then, it sets the maximum capacity that the queue dynamically
|
||||
allocates from the heap. Unused items are not returned to the heap, but are managed by the MultiDelegate
|
||||
instance during its own lifetime for efficiency.
|
||||
*/
|
||||
template< typename Delegate, bool ISQUEUE = false, size_t QUEUE_CAPACITY = 32>
|
||||
class MultiDelegate : public delegate::detail::MultiDelegate<Delegate, typename Delegate::target_type, ISQUEUE, QUEUE_CAPACITY>
|
||||
{
|
||||
public:
|
||||
using delegate::detail::MultiDelegate<Delegate, typename Delegate::target_type, ISQUEUE, QUEUE_CAPACITY>::MultiDelegate;
|
||||
};
|
||||
|
||||
#endif // __MULTIDELEGATE_H
|
||||
384
lib/EspSoftwareSerial/src/circular_queue/circular_queue.h
Normal file
384
lib/EspSoftwareSerial/src/circular_queue/circular_queue.h
Normal file
@@ -0,0 +1,384 @@
|
||||
/*
|
||||
circular_queue.h - Implementation of a lock-free circular queue for EspSoftwareSerial.
|
||||
Copyright (c) 2019 Dirk O. Kaar. All rights reserved.
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
This library 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
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#ifndef __circular_queue_h
|
||||
#define __circular_queue_h
|
||||
|
||||
#ifdef ARDUINO
|
||||
#include <Arduino.h>
|
||||
#endif
|
||||
|
||||
#if defined(ESP8266) || defined(ESP32) || !defined(ARDUINO)
|
||||
#include <atomic>
|
||||
#include <memory>
|
||||
#include <algorithm>
|
||||
#include "Delegate.h"
|
||||
using std::min;
|
||||
#else
|
||||
#include "ghostl.h"
|
||||
#endif
|
||||
|
||||
#if !defined(ESP32) && !defined(ESP8266)
|
||||
#define IRAM_ATTR
|
||||
#endif
|
||||
|
||||
#if defined(__GNUC__)
|
||||
#undef ALWAYS_INLINE_ATTR
|
||||
#define ALWAYS_INLINE_ATTR __attribute__((always_inline))
|
||||
#else
|
||||
#define ALWAYS_INLINE_ATTR
|
||||
#endif
|
||||
|
||||
/*!
|
||||
@brief Instance class for a single-producer, single-consumer circular queue / ring buffer (FIFO).
|
||||
This implementation is lock-free between producer and consumer for the available(), peek(),
|
||||
pop(), and push() type functions.
|
||||
*/
|
||||
template< typename T, typename ForEachArg = void >
|
||||
class circular_queue
|
||||
{
|
||||
public:
|
||||
/*!
|
||||
@brief Constructs a valid, but zero-capacity dummy queue.
|
||||
*/
|
||||
circular_queue() : m_bufSize(1)
|
||||
{
|
||||
m_inPos.store(0);
|
||||
m_outPos.store(0);
|
||||
}
|
||||
/*!
|
||||
@brief Constructs a queue of the given maximum capacity.
|
||||
*/
|
||||
circular_queue(const size_t capacity) : m_bufSize(capacity + 1), m_buffer(new T[m_bufSize])
|
||||
{
|
||||
m_inPos.store(0);
|
||||
m_outPos.store(0);
|
||||
}
|
||||
circular_queue(circular_queue&& cq) :
|
||||
m_bufSize(cq.m_bufSize), m_buffer(cq.m_buffer), m_inPos(cq.m_inPos.load()), m_outPos(cq.m_outPos.load())
|
||||
{}
|
||||
~circular_queue()
|
||||
{
|
||||
m_buffer.reset();
|
||||
}
|
||||
circular_queue(const circular_queue&) = delete;
|
||||
circular_queue& operator=(circular_queue&& cq)
|
||||
{
|
||||
m_bufSize = cq.m_bufSize;
|
||||
m_buffer = cq.m_buffer;
|
||||
m_inPos.store(cq.m_inPos.load());
|
||||
m_outPos.store(cq.m_outPos.load());
|
||||
}
|
||||
circular_queue& operator=(const circular_queue&) = delete;
|
||||
|
||||
/*!
|
||||
@brief Get the numer of elements the queue can hold at most.
|
||||
*/
|
||||
size_t capacity() const
|
||||
{
|
||||
return m_bufSize - 1;
|
||||
}
|
||||
|
||||
/*!
|
||||
@brief Resize the queue. The available elements in the queue are preserved.
|
||||
This is not lock-free and concurrent producer or consumer access
|
||||
will lead to corruption.
|
||||
@return True if the new capacity could accommodate the present elements in
|
||||
the queue, otherwise nothing is done and false is returned.
|
||||
*/
|
||||
bool capacity(const size_t cap);
|
||||
|
||||
/*!
|
||||
@brief Discard all data in the queue.
|
||||
*/
|
||||
void flush()
|
||||
{
|
||||
m_outPos.store(m_inPos.load());
|
||||
}
|
||||
|
||||
/*!
|
||||
@brief Get a snapshot number of elements that can be retrieved by pop.
|
||||
*/
|
||||
size_t IRAM_ATTR available() const
|
||||
{
|
||||
int avail = static_cast<int>(m_inPos.load() - m_outPos.load());
|
||||
if (avail < 0) avail += m_bufSize;
|
||||
return avail;
|
||||
}
|
||||
|
||||
/*!
|
||||
@brief Get the remaining free elementes for pushing.
|
||||
*/
|
||||
size_t IRAM_ATTR available_for_push() const
|
||||
{
|
||||
int avail = static_cast<int>(m_outPos.load() - m_inPos.load()) - 1;
|
||||
if (avail < 0) avail += m_bufSize;
|
||||
return avail;
|
||||
}
|
||||
|
||||
/*!
|
||||
@brief Peek at the next element pop will return without removing it from the queue.
|
||||
@return An rvalue copy of the next element that can be popped. If the queue is empty,
|
||||
return an rvalue copy of the element that is pending the next push.
|
||||
*/
|
||||
T peek() const
|
||||
{
|
||||
const auto outPos = m_outPos.load(std::memory_order_relaxed);
|
||||
std::atomic_thread_fence(std::memory_order_acquire);
|
||||
return m_buffer[outPos];
|
||||
}
|
||||
|
||||
/*!
|
||||
@brief Peek at the next pending input value.
|
||||
@return A reference to the next element that can be pushed.
|
||||
*/
|
||||
T& IRAM_ATTR pushpeek()
|
||||
{
|
||||
const auto inPos = m_inPos.load(std::memory_order_relaxed);
|
||||
std::atomic_thread_fence(std::memory_order_acquire);
|
||||
return m_buffer[inPos];
|
||||
}
|
||||
|
||||
/*!
|
||||
@brief Release the next pending input value, accessible by pushpeek(), into the queue.
|
||||
@return true if the queue accepted the value, false if the queue
|
||||
was full.
|
||||
*/
|
||||
bool IRAM_ATTR push()
|
||||
{
|
||||
const auto inPos = m_inPos.load(std::memory_order_acquire);
|
||||
const size_t next = (inPos + 1) % m_bufSize;
|
||||
if (next == m_outPos.load(std::memory_order_relaxed)) {
|
||||
return false;
|
||||
}
|
||||
std::atomic_thread_fence(std::memory_order_release);
|
||||
m_inPos.store(next, std::memory_order_release);
|
||||
return true;
|
||||
}
|
||||
|
||||
/*!
|
||||
@brief Move the rvalue parameter into the queue.
|
||||
@return true if the queue accepted the value, false if the queue
|
||||
was full.
|
||||
*/
|
||||
bool IRAM_ATTR push(T&& val)
|
||||
{
|
||||
const auto inPos = m_inPos.load(std::memory_order_acquire);
|
||||
const size_t next = (inPos + 1) % m_bufSize;
|
||||
if (next == m_outPos.load(std::memory_order_relaxed)) {
|
||||
return false;
|
||||
}
|
||||
m_buffer[inPos] = std::move(val);
|
||||
std::atomic_thread_fence(std::memory_order_release);
|
||||
m_inPos.store(next, std::memory_order_release);
|
||||
return true;
|
||||
}
|
||||
|
||||
/*!
|
||||
@brief Push a copy of the parameter into the queue.
|
||||
@return true if the queue accepted the value, false if the queue
|
||||
was full.
|
||||
*/
|
||||
inline bool IRAM_ATTR push(const T& val) ALWAYS_INLINE_ATTR
|
||||
{
|
||||
T v(val);
|
||||
return push(std::move(v));
|
||||
}
|
||||
|
||||
#if defined(ESP8266) || defined(ESP32) || !defined(ARDUINO)
|
||||
/*!
|
||||
@brief Push copies of multiple elements from a buffer into the queue,
|
||||
in order, beginning at buffer's head.
|
||||
@return The number of elements actually copied into the queue, counted
|
||||
from the buffer head.
|
||||
*/
|
||||
size_t push_n(const T* buffer, size_t size);
|
||||
#endif
|
||||
|
||||
/*!
|
||||
@brief Pop the next available element from the queue.
|
||||
@return An rvalue copy of the popped element, or a default
|
||||
value of type T if the queue is empty.
|
||||
*/
|
||||
T pop();
|
||||
|
||||
#if defined(ESP8266) || defined(ESP32) || !defined(ARDUINO)
|
||||
/*!
|
||||
@brief Pop multiple elements in ordered sequence from the queue to a buffer.
|
||||
If buffer is nullptr, simply discards up to size elements from the queue.
|
||||
@return The number of elements actually popped from the queue to
|
||||
buffer.
|
||||
*/
|
||||
size_t pop_n(T* buffer, size_t size);
|
||||
#endif
|
||||
|
||||
/*!
|
||||
@brief Iterate over and remove each available element from queue,
|
||||
calling back fun with an rvalue reference of every single element.
|
||||
*/
|
||||
#if defined(ESP8266) || defined(ESP32) || !defined(ARDUINO)
|
||||
void for_each(const Delegate<void(T&&), ForEachArg>& fun);
|
||||
#else
|
||||
void for_each(Delegate<void(T&&), ForEachArg> fun);
|
||||
#endif
|
||||
|
||||
/*!
|
||||
@brief In reverse order, iterate over, pop and optionally requeue each available element from the queue,
|
||||
calling back fun with a reference of every single element.
|
||||
Requeuing is dependent on the return boolean of the callback function. If it
|
||||
returns true, the requeue occurs.
|
||||
*/
|
||||
#if defined(ESP8266) || defined(ESP32) || !defined(ARDUINO)
|
||||
bool for_each_rev_requeue(const Delegate<bool(T&), ForEachArg>& fun);
|
||||
#else
|
||||
bool for_each_rev_requeue(Delegate<bool(T&), ForEachArg> fun);
|
||||
#endif
|
||||
|
||||
protected:
|
||||
size_t m_bufSize;
|
||||
#if defined(ESP8266) || defined(ESP32) || !defined(ARDUINO)
|
||||
std::unique_ptr<T[]> m_buffer;
|
||||
#else
|
||||
std::unique_ptr<T> m_buffer;
|
||||
#endif
|
||||
std::atomic<size_t> m_inPos;
|
||||
std::atomic<size_t> m_outPos;
|
||||
};
|
||||
|
||||
template< typename T, typename ForEachArg >
|
||||
bool circular_queue<T, ForEachArg>::capacity(const size_t cap)
|
||||
{
|
||||
if (cap + 1 == m_bufSize) return true;
|
||||
else if (available() > cap) return false;
|
||||
std::unique_ptr<T[] > buffer(new T[cap + 1]);
|
||||
const auto available = pop_n(buffer, cap);
|
||||
m_buffer.reset(buffer);
|
||||
m_bufSize = cap + 1;
|
||||
m_inPos.store(available, std::memory_order_relaxed);
|
||||
m_outPos.store(0, std::memory_order_relaxed);
|
||||
return true;
|
||||
}
|
||||
|
||||
#if defined(ESP8266) || defined(ESP32) || !defined(ARDUINO)
|
||||
template< typename T, typename ForEachArg >
|
||||
size_t circular_queue<T, ForEachArg>::push_n(const T* buffer, size_t size)
|
||||
{
|
||||
const auto inPos = m_inPos.load(std::memory_order_acquire);
|
||||
const auto outPos = m_outPos.load(std::memory_order_relaxed);
|
||||
|
||||
size_t blockSize = (outPos > inPos) ? outPos - 1 - inPos : (outPos == 0) ? m_bufSize - 1 - inPos : m_bufSize - inPos;
|
||||
blockSize = min(size, blockSize);
|
||||
if (!blockSize) return 0;
|
||||
int next = (inPos + blockSize) % m_bufSize;
|
||||
|
||||
auto dest = m_buffer.get() + inPos;
|
||||
std::copy_n(std::make_move_iterator(buffer), blockSize, dest);
|
||||
size = min(size - blockSize, outPos > 1 ? static_cast<size_t>(outPos - next - 1) : 0);
|
||||
next += size;
|
||||
dest = m_buffer.get();
|
||||
std::copy_n(std::make_move_iterator(buffer + blockSize), size, dest);
|
||||
|
||||
std::atomic_thread_fence(std::memory_order_release);
|
||||
m_inPos.store(next, std::memory_order_release);
|
||||
return blockSize + size;
|
||||
}
|
||||
#endif
|
||||
|
||||
template< typename T, typename ForEachArg >
|
||||
T circular_queue<T, ForEachArg>::pop()
|
||||
{
|
||||
const auto outPos = m_outPos.load(std::memory_order_acquire);
|
||||
if (m_inPos.load(std::memory_order_relaxed) == outPos) return {};
|
||||
|
||||
std::atomic_thread_fence(std::memory_order_acquire);
|
||||
|
||||
auto val = std::move(m_buffer[outPos]);
|
||||
|
||||
m_outPos.store((outPos + 1) % m_bufSize, std::memory_order_release);
|
||||
return val;
|
||||
}
|
||||
|
||||
#if defined(ESP8266) || defined(ESP32) || !defined(ARDUINO)
|
||||
template< typename T, typename ForEachArg >
|
||||
size_t circular_queue<T, ForEachArg>::pop_n(T* buffer, size_t size) {
|
||||
size_t avail = size = min(size, available());
|
||||
if (!avail) return 0;
|
||||
const auto outPos = m_outPos.load(std::memory_order_acquire);
|
||||
size_t n = min(avail, static_cast<size_t>(m_bufSize - outPos));
|
||||
|
||||
std::atomic_thread_fence(std::memory_order_acquire);
|
||||
|
||||
if (buffer) {
|
||||
buffer = std::copy_n(std::make_move_iterator(m_buffer.get() + outPos), n, buffer);
|
||||
avail -= n;
|
||||
std::copy_n(std::make_move_iterator(m_buffer.get()), avail, buffer);
|
||||
}
|
||||
|
||||
m_outPos.store((outPos + size) % m_bufSize, std::memory_order_release);
|
||||
return size;
|
||||
}
|
||||
#endif
|
||||
|
||||
template< typename T, typename ForEachArg >
|
||||
#if defined(ESP8266) || defined(ESP32) || !defined(ARDUINO)
|
||||
void circular_queue<T, ForEachArg>::for_each(const Delegate<void(T&&), ForEachArg>& fun)
|
||||
#else
|
||||
void circular_queue<T, ForEachArg>::for_each(Delegate<void(T&&), ForEachArg> fun)
|
||||
#endif
|
||||
{
|
||||
auto outPos = m_outPos.load(std::memory_order_acquire);
|
||||
const auto inPos = m_inPos.load(std::memory_order_relaxed);
|
||||
std::atomic_thread_fence(std::memory_order_acquire);
|
||||
while (outPos != inPos)
|
||||
{
|
||||
fun(std::move(m_buffer[outPos]));
|
||||
outPos = (outPos + 1) % m_bufSize;
|
||||
m_outPos.store(outPos, std::memory_order_release);
|
||||
}
|
||||
}
|
||||
|
||||
template< typename T, typename ForEachArg >
|
||||
#if defined(ESP8266) || defined(ESP32) || !defined(ARDUINO)
|
||||
bool circular_queue<T, ForEachArg>::for_each_rev_requeue(const Delegate<bool(T&), ForEachArg>& fun)
|
||||
#else
|
||||
bool circular_queue<T, ForEachArg>::for_each_rev_requeue(Delegate<bool(T&), ForEachArg> fun)
|
||||
#endif
|
||||
{
|
||||
auto inPos0 = circular_queue<T, ForEachArg>::m_inPos.load(std::memory_order_acquire);
|
||||
auto outPos = circular_queue<T, ForEachArg>::m_outPos.load(std::memory_order_relaxed);
|
||||
if (outPos == inPos0) return false;
|
||||
auto pos = inPos0;
|
||||
auto outPos1 = inPos0;
|
||||
const auto posDecr = circular_queue<T, ForEachArg>::m_bufSize - 1;
|
||||
std::atomic_thread_fence(std::memory_order_acquire);
|
||||
do {
|
||||
pos = (pos + posDecr) % circular_queue<T, ForEachArg>::m_bufSize;
|
||||
T&& val = std::move(circular_queue<T, ForEachArg>::m_buffer[pos]);
|
||||
if (fun(val))
|
||||
{
|
||||
outPos1 = (outPos1 + posDecr) % circular_queue<T, ForEachArg>::m_bufSize;
|
||||
if (outPos1 != pos) circular_queue<T, ForEachArg>::m_buffer[outPos1] = std::move(val);
|
||||
}
|
||||
} while (pos != outPos);
|
||||
std::atomic_thread_fence(std::memory_order_release);
|
||||
circular_queue<T, ForEachArg>::m_outPos.store(outPos1, std::memory_order_release);
|
||||
return true;
|
||||
}
|
||||
|
||||
#endif // __circular_queue_h
|
||||
310
lib/EspSoftwareSerial/src/circular_queue/circular_queue_mp.h
Normal file
310
lib/EspSoftwareSerial/src/circular_queue/circular_queue_mp.h
Normal file
@@ -0,0 +1,310 @@
|
||||
/*
|
||||
circular_queue_mp.h - Implementation of a lock-free circular queue for EspSoftwareSerial.
|
||||
Copyright (c) 2019 Dirk O. Kaar. All rights reserved.
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
This library 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
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#ifndef __circular_queue_mp_h
|
||||
#define __circular_queue_mp_h
|
||||
|
||||
#include "circular_queue.h"
|
||||
|
||||
#if defined(ESP8266)
|
||||
#include <interrupts.h>
|
||||
using esp8266::InterruptLock;
|
||||
#endif
|
||||
|
||||
/*!
|
||||
@brief Instance class for a multi-producer, single-consumer circular queue / ring buffer (FIFO).
|
||||
This implementation is lock-free between producers and consumer for the available(), peek(),
|
||||
pop(), and push() type functions.
|
||||
*/
|
||||
template< typename T, typename ForEachArg = void >
|
||||
class circular_queue_mp : protected circular_queue<T, ForEachArg>
|
||||
{
|
||||
public:
|
||||
circular_queue_mp() : circular_queue<T, ForEachArg>()
|
||||
{
|
||||
m_inPos_mp.store(0);
|
||||
m_concurrent_mp.store(0);
|
||||
}
|
||||
circular_queue_mp(const size_t capacity) : circular_queue<T, ForEachArg>(capacity)
|
||||
{
|
||||
m_inPos_mp.store(0);
|
||||
m_concurrent_mp.store(0);
|
||||
}
|
||||
circular_queue_mp(circular_queue_mp<T, ForEachArg>&& cq) : circular_queue<T, ForEachArg>(std::move(cq))
|
||||
{
|
||||
m_inPos_mp.store(cq.m_inPos_mp.load());
|
||||
m_concurrent_mp.store(cq.m_concurrent_mp.load());
|
||||
}
|
||||
circular_queue_mp& operator=(circular_queue_mp&& cq)
|
||||
{
|
||||
circular_queue<T, ForEachArg>::operator=(std::move(cq));
|
||||
m_inPos_mp.store(cq.m_inPos_mp.load());
|
||||
m_concurrent_mp.store(cq.m_concurrent_mp.load());
|
||||
}
|
||||
circular_queue_mp& operator=(const circular_queue_mp&) = delete;
|
||||
|
||||
using circular_queue<T, ForEachArg>::capacity;
|
||||
using circular_queue<T, ForEachArg>::flush;
|
||||
using circular_queue<T, ForEachArg>::peek;
|
||||
using circular_queue<T, ForEachArg>::pop;
|
||||
using circular_queue<T, ForEachArg>::pop_n;
|
||||
using circular_queue<T, ForEachArg>::for_each;
|
||||
using circular_queue<T, ForEachArg>::for_each_rev_requeue;
|
||||
|
||||
T& pushpeek() = delete;
|
||||
bool push() = delete;
|
||||
|
||||
inline size_t IRAM_ATTR available() const ALWAYS_INLINE_ATTR
|
||||
{
|
||||
return circular_queue<T, ForEachArg>::available();
|
||||
}
|
||||
inline size_t IRAM_ATTR available_for_push() const ALWAYS_INLINE_ATTR
|
||||
{
|
||||
return circular_queue<T, ForEachArg>::available_for_push();
|
||||
}
|
||||
|
||||
/*!
|
||||
@brief Resize the queue. The available elements in the queue are preserved.
|
||||
This is not lock-free and concurrent producer or consumer access
|
||||
will lead to corruption.
|
||||
@return True if the new capacity could accommodate the present elements in
|
||||
the queue, otherwise nothing is done and false is returned.
|
||||
*/
|
||||
bool capacity(const size_t cap);
|
||||
|
||||
/*!
|
||||
@brief Move the rvalue parameter into the queue, guarded
|
||||
for multiple concurrent producers.
|
||||
@return true if the queue accepted the value, false if the queue
|
||||
was full.
|
||||
*/
|
||||
bool push(T&& val);
|
||||
|
||||
/*!
|
||||
@brief Push a copy of the parameter into the queue, guarded
|
||||
for multiple concurrent producers.
|
||||
@return true if the queue accepted the value, false if the queue
|
||||
was full.
|
||||
*/
|
||||
inline bool IRAM_ATTR push(const T& val) ALWAYS_INLINE_ATTR
|
||||
{
|
||||
T v(val);
|
||||
return push(std::move(v));
|
||||
}
|
||||
|
||||
/*!
|
||||
@brief Push copies of multiple elements from a buffer into the queue,
|
||||
in order, beginning at buffer's head. This is safe for
|
||||
multiple producers.
|
||||
@return The number of elements actually copied into the queue, counted
|
||||
from the buffer head.
|
||||
*/
|
||||
#if defined(ESP8266) || defined(ESP32) || !defined(ARDUINO)
|
||||
size_t push_n(const T* buffer, size_t size);
|
||||
#endif
|
||||
|
||||
protected:
|
||||
std::atomic<size_t> m_inPos_mp;
|
||||
std::atomic<int> m_concurrent_mp;
|
||||
};
|
||||
|
||||
template< typename T, typename ForEachArg >
|
||||
bool circular_queue_mp<T, ForEachArg>::capacity(const size_t cap)
|
||||
{
|
||||
if (cap + 1 == circular_queue<T, ForEachArg>::m_bufSize) return true;
|
||||
else if (!circular_queue<T, ForEachArg>::capacity(cap)) return false;
|
||||
m_inPos_mp.store(circular_queue<T, ForEachArg>::m_inPos.load(std::memory_order_relaxed),
|
||||
std::memory_order_relaxed);
|
||||
m_concurrent_mp.store(0, std::memory_order_relaxed);
|
||||
return true;
|
||||
}
|
||||
|
||||
template< typename T, typename ForEachArg >
|
||||
bool IRAM_ATTR circular_queue_mp<T, ForEachArg>::push(T&& val)
|
||||
{
|
||||
size_t inPos_mp;
|
||||
size_t next;
|
||||
#if !defined(ESP32) && defined(ARDUINO)
|
||||
class InterruptLock {
|
||||
public:
|
||||
InterruptLock() {
|
||||
noInterrupts();
|
||||
}
|
||||
~InterruptLock() {
|
||||
interrupts();
|
||||
}
|
||||
};
|
||||
{
|
||||
InterruptLock lock;
|
||||
#else
|
||||
++m_concurrent_mp;
|
||||
do
|
||||
{
|
||||
#endif
|
||||
inPos_mp = m_inPos_mp.load(std::memory_order_relaxed);
|
||||
next = (inPos_mp + 1) % circular_queue<T, ForEachArg>::m_bufSize;
|
||||
if (next == circular_queue<T, ForEachArg>::m_outPos.load(std::memory_order_relaxed)) {
|
||||
#if !defined(ESP32) && defined(ARDUINO)
|
||||
return false;
|
||||
}
|
||||
m_inPos_mp.store(next, std::memory_order_relaxed);
|
||||
m_concurrent_mp.store(m_concurrent_mp.load(std::memory_order_relaxed) + 1,
|
||||
std::memory_order_relaxed);
|
||||
std::atomic_thread_fence(std::memory_order_release);
|
||||
}
|
||||
#else
|
||||
int concurrent_mp;
|
||||
do
|
||||
{
|
||||
inPos_mp = m_inPos_mp.load();
|
||||
concurrent_mp = m_concurrent_mp.load();
|
||||
if (1 == concurrent_mp)
|
||||
{
|
||||
circular_queue<T, ForEachArg>::m_inPos.store(inPos_mp, std::memory_order_release);
|
||||
}
|
||||
}
|
||||
while (!m_concurrent_mp.compare_exchange_weak(concurrent_mp, concurrent_mp - 1));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
while (!m_inPos_mp.compare_exchange_weak(inPos_mp, next));
|
||||
#endif
|
||||
|
||||
circular_queue<T, ForEachArg>::m_buffer[inPos_mp] = std::move(val);
|
||||
|
||||
std::atomic_thread_fence(std::memory_order_release);
|
||||
|
||||
#if !defined(ESP32) && defined(ARDUINO)
|
||||
{
|
||||
InterruptLock lock;
|
||||
if (1 == m_concurrent_mp.load(std::memory_order_relaxed))
|
||||
{
|
||||
inPos_mp = m_inPos_mp.load(std::memory_order_relaxed);
|
||||
circular_queue<T, ForEachArg>::m_inPos.store(inPos_mp, std::memory_order_relaxed);
|
||||
}
|
||||
m_concurrent_mp.store(m_concurrent_mp.load(std::memory_order_relaxed) - 1,
|
||||
std::memory_order_relaxed);
|
||||
std::atomic_thread_fence(std::memory_order_release);
|
||||
}
|
||||
#else
|
||||
int concurrent_mp;
|
||||
do
|
||||
{
|
||||
inPos_mp = m_inPos_mp.load();
|
||||
concurrent_mp = m_concurrent_mp.load();
|
||||
if (1 == concurrent_mp)
|
||||
{
|
||||
circular_queue<T, ForEachArg>::m_inPos.store(inPos_mp, std::memory_order_release);
|
||||
}
|
||||
}
|
||||
while (!m_concurrent_mp.compare_exchange_weak(concurrent_mp, concurrent_mp - 1));
|
||||
#endif
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
#if defined(ESP8266) || defined(ESP32) || !defined(ARDUINO)
|
||||
template< typename T, typename ForEachArg >
|
||||
size_t circular_queue_mp<T, ForEachArg>::push_n(const T* buffer, size_t size)
|
||||
{
|
||||
const auto outPos = circular_queue<T, ForEachArg>::m_outPos.load(std::memory_order_relaxed);
|
||||
size_t inPos_mp;
|
||||
size_t next;
|
||||
size_t blockSize;
|
||||
#if !defined(ESP32) && defined(ARDUINO)
|
||||
{
|
||||
InterruptLock lock;
|
||||
#else
|
||||
++m_concurrent_mp;
|
||||
do
|
||||
{
|
||||
#endif
|
||||
inPos_mp = m_inPos_mp.load(std::memory_order_relaxed);
|
||||
blockSize = (outPos > inPos_mp) ? outPos - 1 - inPos_mp : (outPos == 0) ? circular_queue<T, ForEachArg>::m_bufSize - 1 - inPos_mp : circular_queue<T, ForEachArg>::m_bufSize - inPos_mp;
|
||||
blockSize = min(size, blockSize);
|
||||
if (!blockSize)
|
||||
{
|
||||
#if !defined(ESP32) && defined(ARDUINO)
|
||||
return 0;
|
||||
}
|
||||
next = (inPos_mp + blockSize) % circular_queue<T, ForEachArg>::m_bufSize;
|
||||
m_inPos_mp.store(next, std::memory_order_relaxed);
|
||||
m_concurrent_mp.store(m_concurrent_mp.load(std::memory_order_relaxed) + 1,
|
||||
std::memory_order_relaxed);
|
||||
std::atomic_thread_fence(std::memory_order_release);
|
||||
}
|
||||
#else
|
||||
int concurrent_mp = m_concurrent_mp.load();
|
||||
do
|
||||
{
|
||||
inPos_mp = m_inPos_mp.load();
|
||||
concurrent_mp = m_concurrent_mp.load();
|
||||
if (1 == concurrent_mp)
|
||||
{
|
||||
circular_queue<T, ForEachArg>::m_inPos.store(inPos_mp, std::memory_order_release);
|
||||
}
|
||||
}
|
||||
while (!m_concurrent_mp.compare_exchange_weak(concurrent_mp, concurrent_mp - 1));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
while (!m_inPos_mp.compare_exchange_weak(inPos_mp, next));
|
||||
#endif
|
||||
|
||||
auto dest = circular_queue<T, ForEachArg>::m_buffer.get() + inPos_mp;
|
||||
std::copy_n(std::make_move_iterator(buffer), blockSize, dest);
|
||||
size = min(size - blockSize, outPos > 1 ? static_cast<size_t>(outPos - next - 1) : 0);
|
||||
next += size;
|
||||
dest = circular_queue<T, ForEachArg>::m_buffer.get();
|
||||
std::copy_n(std::make_move_iterator(buffer + blockSize), size, dest);
|
||||
|
||||
std::atomic_thread_fence(std::memory_order_release);
|
||||
|
||||
#if !defined(ESP32) && defined(ARDUINO)
|
||||
{
|
||||
InterruptLock lock;
|
||||
if (1 == m_concurrent_mp.load(std::memory_order_relaxed))
|
||||
{
|
||||
inPos_mp = m_inPos_mp.load(std::memory_order_relaxed);
|
||||
circular_queue<T, ForEachArg>::m_inPos.store(inPos_mp, std::memory_order_relaxed);
|
||||
}
|
||||
m_concurrent_mp.store(m_concurrent_mp.load(std::memory_order_relaxed) - 1,
|
||||
std::memory_order_relaxed);
|
||||
std::atomic_thread_fence(std::memory_order_release);
|
||||
}
|
||||
#else
|
||||
int concurrent_mp;
|
||||
do
|
||||
{
|
||||
inPos_mp = m_inPos_mp.load();
|
||||
concurrent_mp = m_concurrent_mp.load();
|
||||
if (1 == concurrent_mp)
|
||||
{
|
||||
circular_queue<T, ForEachArg>::m_inPos.store(inPos_mp, std::memory_order_release);
|
||||
}
|
||||
}
|
||||
while (!m_concurrent_mp.compare_exchange_weak(concurrent_mp, concurrent_mp - 1));
|
||||
#endif
|
||||
|
||||
return blockSize + size;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#endif // __circular_queue_mp_h
|
||||
94
lib/EspSoftwareSerial/src/circular_queue/ghostl.h
Normal file
94
lib/EspSoftwareSerial/src/circular_queue/ghostl.h
Normal file
@@ -0,0 +1,94 @@
|
||||
/*
|
||||
ghostl.h - Implementation of a bare-bones, mostly no-op, C++ STL shell
|
||||
that allows building some Arduino ESP8266/ESP32
|
||||
libraries on Aruduino AVR.
|
||||
Copyright (c) 2019 Dirk O. Kaar. All rights reserved.
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
This library 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
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#ifndef __ghostl_h
|
||||
#define __ghostl_h
|
||||
|
||||
#if defined(ARDUINO_ARCH_SAMD)
|
||||
#include <atomic>
|
||||
#endif
|
||||
|
||||
using size_t = decltype(sizeof(char));
|
||||
|
||||
namespace std
|
||||
{
|
||||
#if !defined(ARDUINO_ARCH_SAMD)
|
||||
typedef enum memory_order {
|
||||
memory_order_relaxed,
|
||||
memory_order_acquire,
|
||||
memory_order_release,
|
||||
memory_order_seq_cst
|
||||
} memory_order;
|
||||
template< typename T > class atomic {
|
||||
private:
|
||||
T value;
|
||||
public:
|
||||
atomic() {}
|
||||
atomic(T desired) { value = desired; }
|
||||
void store(T desired, std::memory_order = std::memory_order_seq_cst) volatile noexcept { value = desired; }
|
||||
T load(std::memory_order = std::memory_order_seq_cst) const volatile noexcept { return value; }
|
||||
};
|
||||
inline void atomic_thread_fence(std::memory_order order) noexcept {}
|
||||
template< typename T > T&& move(T& t) noexcept { return static_cast<T&&>(t); }
|
||||
#endif
|
||||
|
||||
template< typename T, size_t long N > struct array
|
||||
{
|
||||
T _M_elems[N];
|
||||
decltype(sizeof(0)) size() const { return N; }
|
||||
T& operator[](decltype(sizeof(0)) i) { return _M_elems[i]; }
|
||||
const T& operator[](decltype(sizeof(0)) i) const { return _M_elems[i]; }
|
||||
};
|
||||
|
||||
template< typename T > class unique_ptr
|
||||
{
|
||||
public:
|
||||
using pointer = T*;
|
||||
unique_ptr() noexcept : ptr(nullptr) {}
|
||||
unique_ptr(pointer p) : ptr(p) {}
|
||||
pointer operator->() const noexcept { return ptr; }
|
||||
T& operator[](decltype(sizeof(0)) i) const { return ptr[i]; }
|
||||
void reset(pointer p = pointer()) noexcept
|
||||
{
|
||||
delete ptr;
|
||||
ptr = p;
|
||||
}
|
||||
T& operator*() const { return *ptr; }
|
||||
private:
|
||||
pointer ptr;
|
||||
};
|
||||
|
||||
template< typename T > using function = T*;
|
||||
using nullptr_t = decltype(nullptr);
|
||||
|
||||
template<typename T>
|
||||
struct identity {
|
||||
typedef T type;
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
inline T&& forward(typename identity<T>::type& t) noexcept
|
||||
{
|
||||
return static_cast<typename identity<T>::type&&>(t);
|
||||
}
|
||||
}
|
||||
|
||||
#endif // __ghostl_h
|
||||
657
src/modules/display/Nextion/ESPNexUpload.cpp
Normal file
657
src/modules/display/Nextion/ESPNexUpload.cpp
Normal file
@@ -0,0 +1,657 @@
|
||||
/**
|
||||
* @file NexUpload.cpp
|
||||
*
|
||||
* The implementation of uploading tft file for nextion displays.
|
||||
*
|
||||
* Original version (a part of https://github.com/itead/ITEADLIB_Arduino_Nextion)
|
||||
* @author Chen Zengpeng (email:<zengpeng.chen@itead.cc>)
|
||||
* @date 2016/3/29
|
||||
* @copyright
|
||||
* Copyright (C) 2014-2015 ITEAD Intelligent Systems Co., Ltd.
|
||||
*
|
||||
* 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, version 3.
|
||||
*
|
||||
* 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/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#define DEBUG_SERIAL_ENABLE
|
||||
#include "ESPNexUpload.h"
|
||||
|
||||
#ifdef DEBUG_SERIAL_ENABLE
|
||||
#define dbSerialPrint(a) Serial.print(a)
|
||||
#define dbSerialPrintHex(a) Serial.print(a, HEX)
|
||||
#define dbSerialPrintln(a) Serial.println(a)
|
||||
#define dbSerialBegin(a) Serial.begin(a)
|
||||
#else
|
||||
#define dbSerialPrint(a) \
|
||||
do \
|
||||
{ \
|
||||
} while (0)
|
||||
#define dbSerialPrintHex(a) \
|
||||
do \
|
||||
{ \
|
||||
} while (0)
|
||||
#define dbSerialPrintln(a) \
|
||||
do \
|
||||
{ \
|
||||
} while (0)
|
||||
#define dbSerialBegin(a) \
|
||||
do \
|
||||
{ \
|
||||
} while (0)
|
||||
#endif
|
||||
|
||||
ESPNexUpload::ESPNexUpload(uint32_t upload_baudrate, int line, int rx, int tx)
|
||||
{
|
||||
_upload_baudrate = upload_baudrate;
|
||||
_rx = rx;
|
||||
_tx = tx;
|
||||
_line = line;
|
||||
|
||||
#if defined ESP8266
|
||||
nexSerial = new SoftwareSerial(_rx, _tx);
|
||||
#else
|
||||
if (line >= 0) {
|
||||
nexSerial = new HardwareSerial(line);
|
||||
// ((HardwareSerial*)nexSerial)->begin(_upload_baudrate, SERIAL_8N1, _rx, _tx);
|
||||
} else {
|
||||
nexSerial = new SoftwareSerial(_rx, _tx);
|
||||
// ((SoftwareSerial*)nexSerial)->begin(_upload_baudrate);
|
||||
}
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
void ESPNexUpload::nexSerialBegin(uint32_t _speed, int _line, int _rx, int _tx)
|
||||
{
|
||||
#if defined ESP8266
|
||||
nexSerial->begin(_speed);
|
||||
#else
|
||||
if (_line >= 0) {
|
||||
((HardwareSerial*)nexSerial)->begin(_speed, SERIAL_8N1, _rx, _tx);
|
||||
} else {
|
||||
((SoftwareSerial*)nexSerial)->begin(_speed);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
bool ESPNexUpload::connect()
|
||||
{
|
||||
#if defined ESP8266
|
||||
yield();
|
||||
#endif
|
||||
|
||||
dbSerialBegin(115200);
|
||||
_printInfoLine(F("serial tests & connect"));
|
||||
|
||||
if (_getBaudrate() == 0)
|
||||
{
|
||||
statusMessage = F("get baudrate error");
|
||||
_printInfoLine(statusMessage);
|
||||
return false;
|
||||
}
|
||||
|
||||
_setRunningMode();
|
||||
|
||||
if (!_echoTest("mystop_yesABC"))
|
||||
{
|
||||
statusMessage = F("echo test failed");
|
||||
_printInfoLine(statusMessage);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!_handlingSleepAndDim())
|
||||
{
|
||||
statusMessage = F("handling sleep and dim settings failed");
|
||||
_printInfoLine(statusMessage);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!_setPrepareForFirmwareUpdate(_upload_baudrate))
|
||||
{
|
||||
statusMessage = F("modifybaudrate error");
|
||||
_printInfoLine(statusMessage);
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ESPNexUpload::prepareUpload(uint32_t file_size)
|
||||
{
|
||||
_undownloadByte = file_size;
|
||||
return this->connect();
|
||||
}
|
||||
|
||||
uint16_t ESPNexUpload::_getBaudrate(void)
|
||||
{
|
||||
|
||||
_baudrate = 0;
|
||||
uint32_t baudrate_array[7] = {115200, 19200, 9600, 57600, 38400, 4800, 2400};
|
||||
for (uint8_t i = 0; i < 7; i++)
|
||||
{
|
||||
if (_searchBaudrate(baudrate_array[i]))
|
||||
{
|
||||
_baudrate = baudrate_array[i];
|
||||
_printInfoLine(F("baudrate determined"));
|
||||
break;
|
||||
}
|
||||
delay(1500); // wait for 1500 ms
|
||||
}
|
||||
return _baudrate;
|
||||
}
|
||||
|
||||
bool ESPNexUpload::_searchBaudrate(uint32_t baudrate)
|
||||
{
|
||||
|
||||
#if defined ESP8266
|
||||
yield();
|
||||
#endif
|
||||
|
||||
String response = String("");
|
||||
_printInfoLine();
|
||||
dbSerialPrint(F("init nextion serial interface on baudrate: "));
|
||||
dbSerialPrintln(baudrate);
|
||||
|
||||
nexSerialBegin(baudrate, _line, _rx, _tx);
|
||||
_printInfoLine(F("ESP baudrate established, try to connect to display"));
|
||||
const char _nextion_FF_FF[3] = {0xFF, 0xFF, 0x00};
|
||||
|
||||
this->sendCommand("DRAKJHSUYDGBNCJHGJKSHBDN");
|
||||
this->sendCommand("", true, true); // 0x00 0xFF 0xFF 0xFF
|
||||
|
||||
this->recvRetString(response);
|
||||
if (response[0] != 0x1A)
|
||||
{
|
||||
_printInfoLine(F("first indication that baudrate is wrong"));
|
||||
}
|
||||
else
|
||||
{
|
||||
_printInfoLine(F("first respone from display, first indication that baudrate is correct"));
|
||||
}
|
||||
|
||||
this->sendCommand("connect"); // first connect attempt
|
||||
|
||||
this->recvRetString(response);
|
||||
if (response.indexOf(F("comok")) == -1)
|
||||
{
|
||||
_printInfoLine(F("display doesn't accept the first connect request"));
|
||||
}
|
||||
else
|
||||
{
|
||||
_printInfoLine(F("display accept the first connect request"));
|
||||
}
|
||||
|
||||
response = String("");
|
||||
delay(110); // based on serial analyser from Nextion editor V0.58 to Nextion display NX4024T032_011R
|
||||
this->sendCommand(_nextion_FF_FF, false);
|
||||
|
||||
this->sendCommand("connect"); // second attempt
|
||||
this->recvRetString(response);
|
||||
if (response.indexOf(F("comok")) == -1 && response[0] != 0x1A)
|
||||
{
|
||||
_printInfoLine(F("display doesn't accept the second connect request"));
|
||||
_printInfoLine(F("conclusion, wrong baudrate"));
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
_printInfoLine(F("display accept the second connect request"));
|
||||
_printInfoLine(F("conclusion, correct baudrate"));
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
void ESPNexUpload::sendCommand(const char *cmd, bool tail, bool null_head)
|
||||
{
|
||||
|
||||
#if defined ESP8266
|
||||
yield();
|
||||
#endif
|
||||
|
||||
if (null_head)
|
||||
{
|
||||
((HardwareSerial*)nexSerial)->write(0x00);
|
||||
}
|
||||
|
||||
while (nexSerial->available())
|
||||
{
|
||||
nexSerial->read();
|
||||
}
|
||||
|
||||
nexSerial->print(cmd);
|
||||
if (tail)
|
||||
{
|
||||
nexSerial->write(0xFF);
|
||||
nexSerial->write(0xFF);
|
||||
nexSerial->write(0xFF);
|
||||
}
|
||||
_printSerialData(true, cmd);
|
||||
}
|
||||
|
||||
uint16_t ESPNexUpload::recvRetString(String &response, uint32_t timeout, bool recv_flag)
|
||||
{
|
||||
|
||||
#if defined ESP8266
|
||||
yield();
|
||||
#endif
|
||||
|
||||
uint16_t ret = 0;
|
||||
uint8_t c = 0;
|
||||
uint8_t nr_of_FF_bytes = 0;
|
||||
long start;
|
||||
bool exit_flag = false;
|
||||
bool ff_flag = false;
|
||||
if (timeout != 500)
|
||||
_printInfoLine("timeout setting serial read: " + String(timeout));
|
||||
|
||||
start = millis();
|
||||
|
||||
while (millis() - start <= timeout)
|
||||
{
|
||||
|
||||
while (nexSerial->available())
|
||||
{
|
||||
|
||||
c = nexSerial->read();
|
||||
if (c == 0)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (c == 0xFF)
|
||||
nr_of_FF_bytes++;
|
||||
else
|
||||
{
|
||||
nr_of_FF_bytes = 0;
|
||||
ff_flag = false;
|
||||
}
|
||||
|
||||
if (nr_of_FF_bytes >= 3)
|
||||
ff_flag = true;
|
||||
|
||||
response += (char)c;
|
||||
|
||||
if (recv_flag)
|
||||
{
|
||||
if (response.indexOf(0x05) != -1)
|
||||
{
|
||||
exit_flag = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (exit_flag || ff_flag)
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
_printSerialData(false, response);
|
||||
|
||||
// if the exit flag and the ff flag are both not found, than there is a timeout
|
||||
// if(!exit_flag && !ff_flag)
|
||||
// _printInfoLine(F("recvRetString: timeout"));
|
||||
|
||||
if (ff_flag)
|
||||
response = response.substring(0, response.length() - 3); // Remove last 3 0xFF
|
||||
|
||||
ret = response.length();
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool ESPNexUpload::_setPrepareForFirmwareUpdate(uint32_t upload_baudrate)
|
||||
{
|
||||
|
||||
#if defined ESP8266
|
||||
yield();
|
||||
#endif
|
||||
|
||||
String response = String("");
|
||||
String cmd = String("");
|
||||
|
||||
cmd = F("00");
|
||||
this->sendCommand(cmd.c_str());
|
||||
delay(0.1);
|
||||
|
||||
this->recvRetString(response, 800, true); // normal response time is 400ms
|
||||
|
||||
String filesize_str = String(_undownloadByte, 10);
|
||||
String baudrate_str = String(upload_baudrate);
|
||||
cmd = "whmi-wri " + filesize_str + "," + baudrate_str + ",0";
|
||||
|
||||
this->sendCommand(cmd.c_str());
|
||||
|
||||
// Without flush, the whmi command will NOT transmitted by the ESP in the current baudrate
|
||||
// because switching to another baudrate (nexSerialBegin command) has an higher prio.
|
||||
// The ESP will first jump to the new 'upload_baudrate' and than process the serial 'transmit buffer'
|
||||
// The flush command forced the ESP to wait until the 'transmit buffer' is empty
|
||||
nexSerial->flush();
|
||||
|
||||
nexSerialBegin(upload_baudrate, _line, _rx, _tx);
|
||||
_printInfoLine(F("changing upload baudrate..."));
|
||||
_printInfoLine(String(upload_baudrate));
|
||||
|
||||
this->recvRetString(response, 800, true); // normal response time is 400ms
|
||||
|
||||
// The Nextion display will, if it's ready to accept data, send a 0x05 byte.
|
||||
if (response.indexOf(0x05) != -1)
|
||||
{
|
||||
_printInfoLine(F("preparation for firmware update done"));
|
||||
return 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
_printInfoLine(F("preparation for firmware update failed"));
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
void ESPNexUpload::setUpdateProgressCallback(THandlerFunction value)
|
||||
{
|
||||
_updateProgressCallback = value;
|
||||
}
|
||||
|
||||
bool ESPNexUpload::upload(const uint8_t *file_buf, size_t buf_size)
|
||||
{
|
||||
|
||||
#if defined ESP8266
|
||||
yield();
|
||||
#endif
|
||||
|
||||
uint8_t c;
|
||||
uint8_t timeout = 0;
|
||||
String string = String("");
|
||||
|
||||
for (uint16_t i = 0; i < buf_size; i++)
|
||||
{
|
||||
|
||||
// Users must split the .tft file contents into 4096 byte sized packets with the final partial packet size equal to the last remaining bytes (<4096 bytes).
|
||||
if (_sent_packets == 4096)
|
||||
{
|
||||
|
||||
// wait for the Nextion to return its 0x05 byte confirming reception and readiness to receive the next packets
|
||||
this->recvRetString(string, 500, true);
|
||||
if (string.indexOf(0x05) != -1)
|
||||
{
|
||||
|
||||
// reset sent packets counter
|
||||
_sent_packets = 0;
|
||||
|
||||
// reset receive String
|
||||
string = "";
|
||||
}
|
||||
else
|
||||
{
|
||||
if (timeout >= 8)
|
||||
{
|
||||
statusMessage = F("serial connection lost");
|
||||
_printInfoLine(statusMessage);
|
||||
return false;
|
||||
}
|
||||
|
||||
timeout++;
|
||||
}
|
||||
|
||||
// delay current byte
|
||||
i--;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
// read buffer
|
||||
c = file_buf[i];
|
||||
|
||||
// write byte to nextion over serial
|
||||
nexSerial->write(c);
|
||||
|
||||
// update sent packets counter
|
||||
_sent_packets++;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ESPNexUpload::upload(Stream &myFile)
|
||||
{
|
||||
#if defined ESP8266
|
||||
yield();
|
||||
#endif
|
||||
|
||||
// create buffer for read
|
||||
uint8_t buff[2048] = {0};
|
||||
|
||||
// read all data from server
|
||||
while (_undownloadByte > 0 || _undownloadByte == -1)
|
||||
{
|
||||
|
||||
// get available data size
|
||||
size_t size = myFile.available();
|
||||
|
||||
if (size)
|
||||
{
|
||||
// read up to 2048 byte into the buffer
|
||||
int c = myFile.readBytes(buff, ((size > sizeof(buff)) ? sizeof(buff) : size));
|
||||
|
||||
// Write the buffered bytes to the nextion. If this fails, return false.
|
||||
if (!this->upload(buff, c))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (_updateProgressCallback)
|
||||
{
|
||||
_updateProgressCallback();
|
||||
}
|
||||
}
|
||||
|
||||
if (_undownloadByte > 0)
|
||||
{
|
||||
_undownloadByte -= c;
|
||||
}
|
||||
}
|
||||
delay(1);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void ESPNexUpload::softReset(void)
|
||||
{
|
||||
// soft reset nextion device
|
||||
this->sendCommand("rest");
|
||||
}
|
||||
|
||||
void ESPNexUpload::end()
|
||||
{
|
||||
|
||||
// wait for the nextion to finish internal processes
|
||||
delay(1600);
|
||||
|
||||
// soft reset the nextion
|
||||
this->softReset();
|
||||
|
||||
// end Serial connection
|
||||
((HardwareSerial*)nexSerial)->end();
|
||||
|
||||
// reset sent packets counter
|
||||
_sent_packets = 0;
|
||||
|
||||
statusMessage = F("upload ok");
|
||||
_printInfoLine(statusMessage + F("\r\n"));
|
||||
}
|
||||
|
||||
void ESPNexUpload::_setRunningMode(void)
|
||||
{
|
||||
String cmd = String("");
|
||||
delay(100);
|
||||
cmd = F("runmod=2");
|
||||
this->sendCommand(cmd.c_str());
|
||||
delay(60);
|
||||
}
|
||||
|
||||
bool ESPNexUpload::_echoTest(String input)
|
||||
{
|
||||
String cmd = String("");
|
||||
String response = String("");
|
||||
|
||||
cmd = "print \"" + input + "\"";
|
||||
this->sendCommand(cmd.c_str());
|
||||
|
||||
uint32_t duration_ms = calculateTransmissionTimeMs(cmd) * 2 + 10; // times 2 (send + receive) and 10 ms extra
|
||||
this->recvRetString(response, duration_ms);
|
||||
|
||||
return (response.indexOf(input) != -1);
|
||||
}
|
||||
|
||||
bool ESPNexUpload::_handlingSleepAndDim(void)
|
||||
{
|
||||
String cmd = String("");
|
||||
String response = String("");
|
||||
bool set_sleep = false;
|
||||
bool set_dim = false;
|
||||
|
||||
cmd = F("get sleep");
|
||||
this->sendCommand(cmd.c_str());
|
||||
|
||||
this->recvRetString(response);
|
||||
|
||||
if (response[0] != 0x71)
|
||||
{
|
||||
statusMessage = F("unknown response from 'get sleep' request");
|
||||
_printInfoLine(statusMessage);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (response[1] != 0x00)
|
||||
{
|
||||
_printInfoLine(F("sleep enabled"));
|
||||
set_sleep = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
_printInfoLine(F("sleep disabled"));
|
||||
}
|
||||
|
||||
response = String("");
|
||||
cmd = F("get dim");
|
||||
this->sendCommand(cmd.c_str());
|
||||
|
||||
this->recvRetString(response);
|
||||
|
||||
if (response[0] != 0x71)
|
||||
{
|
||||
statusMessage = F("unknown response from 'get dim' request");
|
||||
_printInfoLine(statusMessage);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (response[1] == 0x00)
|
||||
{
|
||||
_printInfoLine(F("dim is 0%, backlight from display is turned off"));
|
||||
set_dim = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
_printInfoLine();
|
||||
dbSerialPrint(F("dim "));
|
||||
dbSerialPrint((uint8_t)response[1]);
|
||||
dbSerialPrintln(F("%"));
|
||||
}
|
||||
|
||||
if (!_echoTest("ABC"))
|
||||
{
|
||||
statusMessage = F("echo test in 'handling sleep and dim' failed");
|
||||
_printInfoLine(statusMessage);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (set_sleep)
|
||||
{
|
||||
cmd = F("sleep=0");
|
||||
this->sendCommand(cmd.c_str());
|
||||
// Unfortunately the display doesn't send any respone on the wake up request (sleep=0)
|
||||
// Let the ESP wait for one second, this is based on serial analyser from Nextion editor V0.58 to Nextion display NX4024T032_011R
|
||||
// This gives the Nextion display some time to wake up
|
||||
delay(1000);
|
||||
}
|
||||
|
||||
if (set_dim)
|
||||
{
|
||||
cmd = F("dim=100");
|
||||
this->sendCommand(cmd.c_str());
|
||||
delay(15);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void ESPNexUpload::_printSerialData(bool esp_request, String input)
|
||||
{
|
||||
|
||||
char c;
|
||||
if (esp_request)
|
||||
dbSerialPrint(F("ESP request: "));
|
||||
else
|
||||
dbSerialPrint(F("Nextion respone: "));
|
||||
|
||||
if (input.length() == 0)
|
||||
{
|
||||
dbSerialPrintln(F("none"));
|
||||
return;
|
||||
}
|
||||
|
||||
for (int i = 0; i < input.length(); i++)
|
||||
{
|
||||
|
||||
c = input[i];
|
||||
if ((uint8_t)c >= 0x20 && (uint8_t)c <= 0x7E)
|
||||
dbSerialPrint(c);
|
||||
else
|
||||
{
|
||||
dbSerialPrint(F("0x"));
|
||||
dbSerialPrintHex(c);
|
||||
dbSerialPrint(F(" "));
|
||||
}
|
||||
}
|
||||
dbSerialPrintln();
|
||||
}
|
||||
|
||||
uint32_t ESPNexUpload::calculateTransmissionTimeMs(String message)
|
||||
{
|
||||
// In general, 1 second (s) = 1000 (10^-3) millisecond (ms) or
|
||||
// 1 second (s) = 1000 000 (10^-6) microsecond (us).
|
||||
// To calculate how much microsecond one BIT of data takes with a certain baudrate you have to divide
|
||||
// the baudrate by one second.
|
||||
// For example 9600 baud = 1000 000 us / 9600 ≈ 104 us
|
||||
// The time to transmit one DATA byte (if we use default UART modulation) takes 10 bits.
|
||||
// 8 DATA bits and one START and one STOP bit makes 10 bits.
|
||||
// In this example (9600 baud) a byte will take 1041 us to send or receive.
|
||||
// Multiply this value by the length of the message (number of bytes) and the total transmit/ receive time
|
||||
// is calculated.
|
||||
|
||||
uint32_t duration_one_byte_us = 10000000 / _baudrate; // 1000 000 * 10 bits / baudrate
|
||||
uint16_t nr_of_bytes = message.length() + 3; // 3 times 0xFF byte
|
||||
uint32_t duration_message_us = nr_of_bytes * duration_one_byte_us;
|
||||
uint32_t return_value_ms = duration_message_us / 1000;
|
||||
|
||||
_printInfoLine("calculated transmission time: " + String(return_value_ms) + " ms");
|
||||
return return_value_ms;
|
||||
}
|
||||
|
||||
void ESPNexUpload::_printInfoLine(String line)
|
||||
{
|
||||
dbSerialPrint(F("Status info: "));
|
||||
if (line.length() != 0)
|
||||
dbSerialPrintln(line);
|
||||
}
|
||||
288
src/modules/display/Nextion/ESPNexUpload.h
Normal file
288
src/modules/display/Nextion/ESPNexUpload.h
Normal file
@@ -0,0 +1,288 @@
|
||||
/**
|
||||
* @file NexUpload.h
|
||||
* The definition of class NexUpload.
|
||||
*
|
||||
*
|
||||
* 1 - BugFix when display baudrate is diffrent from initial ESP baudrate
|
||||
* 2 - Improved debug information
|
||||
* 3 - Make delay commands dependent on the baudrate
|
||||
* @author Machiel Mastenbroek (machiel.mastenbroek@gmail.com)
|
||||
* @date 2019/11/04
|
||||
* @version 0.5.5
|
||||
*
|
||||
* Stability improvement, Nextion display doesn’t freeze after the seconds 4096 trance of firmware bytes.
|
||||
* Now the firmware upload process is stabled without the need of a hard Display power off-on intervention.
|
||||
* Undocumented features (not mentioned in nextion-hmi-upload-protocol-v1-1 specification) are added.
|
||||
* This implementation is based in on a reverse engineering with a UART logic analyser between
|
||||
* the Nextion editor v0.58 and a NX4024T032_011R Display.
|
||||
*
|
||||
* @author Machiel Mastenbroek (machiel.mastenbroek@gmail.com)
|
||||
* @date 2019/10/24
|
||||
* @version 0.5.0
|
||||
*
|
||||
* Modified to work with ESP32, HardwareSerial and removed SPIFFS dependency
|
||||
* @author Onno Dirkzwager (onno.dirkzwager@gmail.com)
|
||||
* @date 2018/12/26
|
||||
* @version 0.3.0
|
||||
*
|
||||
* Modified to work with ESP8266 and SoftwareSerial
|
||||
* @author Ville Vilpas (psoden@gmail.com)
|
||||
* @date 2018/2/3
|
||||
* @version 0.2.0
|
||||
*
|
||||
* Original version (a part of https://github.com/itead/ITEADLIB_Arduino_Nextion)
|
||||
* @author Chen Zengpeng (email:<zengpeng.chen@itead.cc>)
|
||||
* @date 2016/3/29
|
||||
* @copyright
|
||||
* Copyright (C) 2014-2015 ITEAD Intelligent Systems Co., Ltd.
|
||||
*
|
||||
* 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, version 3.
|
||||
*
|
||||
* 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 __ESPNEXUPLOAD_H__
|
||||
#define __ESPNEXUPLOAD_H__
|
||||
#include <functional>
|
||||
#include <Arduino.h>
|
||||
#include <StreamString.h>
|
||||
|
||||
#ifdef ESP8266
|
||||
#include <SoftwareSerial.h>
|
||||
#else
|
||||
#include <HardwareSerial.h>
|
||||
#include <SoftwareSerial.h>
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @addtogroup CoreAPI
|
||||
* @{
|
||||
*/
|
||||
|
||||
// callback template definition
|
||||
typedef std::function<void(void)> THandlerFunction;
|
||||
|
||||
/**
|
||||
*
|
||||
* Provides the API for nextion to upload the ftf file.
|
||||
*/
|
||||
class ESPNexUpload
|
||||
{
|
||||
public: /* methods */
|
||||
// callback template definition
|
||||
typedef std::function<void(void)> THandlerFunction;
|
||||
|
||||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param uint32_t upload_baudrate - set upload baudrate.
|
||||
*/
|
||||
ESPNexUpload(uint32_t upload_baudrate, int line, int rx, int tx);
|
||||
|
||||
/**
|
||||
* destructor.
|
||||
*
|
||||
*/
|
||||
~ESPNexUpload() {}
|
||||
|
||||
/**
|
||||
* Connect to Nextion over serial
|
||||
*
|
||||
* @return true or false.
|
||||
*/
|
||||
bool connect();
|
||||
|
||||
/**
|
||||
* prepare upload. Set file size & Connect to Nextion over serial
|
||||
*
|
||||
* @return true if success, false for failure.
|
||||
*/
|
||||
bool prepareUpload(uint32_t file_size);
|
||||
|
||||
/**
|
||||
* set Update Progress Callback. (What to do during update progress)
|
||||
*
|
||||
* @return none
|
||||
*/
|
||||
void setUpdateProgressCallback(THandlerFunction value);
|
||||
|
||||
/**
|
||||
* start update tft file to nextion.
|
||||
*
|
||||
* @param const uint8_t *file_buf
|
||||
* @param size_t buf_size
|
||||
* @return true if success, false for failure.
|
||||
*/
|
||||
bool upload(const uint8_t *file_buf, size_t buf_size);
|
||||
|
||||
/**
|
||||
* start update tft file to nextion.
|
||||
*
|
||||
* @param Stream &myFile
|
||||
* @return true if success, false for failure.
|
||||
*/
|
||||
bool upload(Stream &myFile);
|
||||
|
||||
/**
|
||||
* Send reset command to Nextion over serial
|
||||
*
|
||||
* @return none.
|
||||
*/
|
||||
void softReset(void);
|
||||
|
||||
/**
|
||||
* Send reset, end serial, reset _sent_packets & update status message
|
||||
*
|
||||
* @return none.
|
||||
*/
|
||||
void end(void);
|
||||
|
||||
public: /* data */
|
||||
String statusMessage = "";
|
||||
|
||||
private: /* methods */
|
||||
/*
|
||||
* get communicate baudrate.
|
||||
*
|
||||
* @return communicate baudrate.
|
||||
*
|
||||
*/
|
||||
uint16_t _getBaudrate(void);
|
||||
|
||||
/*
|
||||
* search communicate baudrate.
|
||||
*
|
||||
* @param baudrate - communicate baudrate.
|
||||
*
|
||||
* @return true if success, false for failure.
|
||||
*/
|
||||
bool _searchBaudrate(uint32_t baudrate);
|
||||
|
||||
/*
|
||||
* set download baudrate.
|
||||
*
|
||||
* @param baudrate - set download baudrate.
|
||||
*
|
||||
* @return true if success, false for failure.
|
||||
*/
|
||||
bool _setPrepareForFirmwareUpdate(uint32_t upload_baudrate);
|
||||
|
||||
/*
|
||||
* set Nextion running mode.
|
||||
*
|
||||
* Undocumented feature of the Nextion protocol.
|
||||
* It's used by the 'upload to Nextion device' feature of the Nextion Editor V0.58
|
||||
*
|
||||
* The nextion display doesn't send any response
|
||||
*
|
||||
*/
|
||||
void _setRunningMode(void);
|
||||
|
||||
/*
|
||||
* Test UART nextion connection availability
|
||||
*
|
||||
* @param input - echo string,
|
||||
*
|
||||
* @return true when the 'echo string' that is send is equal to the received string
|
||||
*
|
||||
* This test is used by the 'upload to Nextion device' feature of the Nextion Editor V0.58
|
||||
*
|
||||
*/
|
||||
bool _echoTest(String input);
|
||||
|
||||
/*
|
||||
* This function get the sleep and dim value from the Nextion display.
|
||||
*
|
||||
* If sleep = 1 meaning: sleep is enabled
|
||||
* action : sleep will be disabled
|
||||
* If dim = 0, meaning: the display backlight is turned off
|
||||
* action : dim will be set to 100 (percent)
|
||||
*
|
||||
*/
|
||||
bool _handlingSleepAndDim(void);
|
||||
|
||||
/*
|
||||
* This function (debug) print the Nextion response to a human readable string
|
||||
*
|
||||
* @param esp_request - true: request message from esp to nextion
|
||||
* false: response message from nextion to esp
|
||||
*
|
||||
* @param input - string to print
|
||||
*
|
||||
*/
|
||||
void _printSerialData(bool esp_request, String input);
|
||||
|
||||
/*
|
||||
* This function print a prefix debug line
|
||||
*
|
||||
* @param line: optional debug/ info line
|
||||
*/
|
||||
void _printInfoLine(String line = "");
|
||||
|
||||
/*
|
||||
* Send command to Nextion.
|
||||
*
|
||||
* @param cmd - the string of command.
|
||||
* @param tail - end the string with tripple 0xFF byte
|
||||
* @param null_head - start the string with a single 0x00 byte
|
||||
*
|
||||
* @return none.
|
||||
*/
|
||||
void sendCommand(const char *cmd, bool tail = true, bool null_head = false);
|
||||
|
||||
/*
|
||||
* Receive string data.
|
||||
*
|
||||
* @param buffer - save string data.
|
||||
* @param timeout - set timeout time.
|
||||
* @param recv_flag - if recv_flag is true,will braak when receive 0x05.
|
||||
*
|
||||
* @return the length of string buffer.
|
||||
*
|
||||
*/
|
||||
uint16_t recvRetString(String &string, uint32_t timeout = 500, bool recv_flag = false);
|
||||
|
||||
/*
|
||||
*
|
||||
* This function calculates the transmission time, the transmission time
|
||||
* is based on the length of the message and the baudrate.
|
||||
*
|
||||
* @param message - only used to determine the length of the message
|
||||
*
|
||||
* @return time in us length of string buffer.
|
||||
*
|
||||
*/
|
||||
uint32_t calculateTransmissionTimeMs(String message);
|
||||
|
||||
void nexSerialBegin(uint32_t upload_baudrate, int line, int rx, int tx);
|
||||
|
||||
private: /* data */
|
||||
uint32_t _baudrate; /* nextion serail baudrate */
|
||||
uint32_t _undownloadByte; /* undownload byte of tft file */
|
||||
uint32_t _upload_baudrate; /* upload baudrate */
|
||||
uint16_t _sent_packets = 0; /* upload baudrate */
|
||||
uint8_t _rx;
|
||||
uint8_t _tx;
|
||||
uint8_t _line;
|
||||
THandlerFunction _updateProgressCallback;
|
||||
|
||||
#ifdef ESP8266
|
||||
SoftwareSerial* nexSerial;
|
||||
#else
|
||||
Stream* nexSerial;
|
||||
#endif
|
||||
};
|
||||
/**
|
||||
* @}
|
||||
*/
|
||||
|
||||
#endif /* #ifndef __ESPNEXUPLOAD_H__ */
|
||||
312
src/modules/display/Nextion/Nextion.cpp
Normal file
312
src/modules/display/Nextion/Nextion.cpp
Normal file
@@ -0,0 +1,312 @@
|
||||
|
||||
#define DEBUG_SERIAL_ENABLE
|
||||
#include "Global.h"
|
||||
#include "classes/IoTUart.h"
|
||||
#include "ESPNexUpload.h"
|
||||
bool updated = false;
|
||||
|
||||
class Nextion : public IoTUart
|
||||
{
|
||||
private:
|
||||
String _url;
|
||||
String _host;
|
||||
int _tx, _rx, _speed, _line;
|
||||
bool _UpTelegram;
|
||||
char _inc;
|
||||
String _inStr = ""; // буфер приема строк в режимах 0, 1, 2
|
||||
|
||||
// Выводим русские буквы на экран Nextion (преобразуем в кодировку ISO-8859-5)
|
||||
String convertRUS(String text)
|
||||
{
|
||||
const char *in = text.c_str();
|
||||
String out;
|
||||
if (in == NULL)
|
||||
return out;
|
||||
|
||||
uint32_t codepoint = 0;
|
||||
while (*in != 0)
|
||||
{
|
||||
uint8_t ch = (uint8_t)(*in);
|
||||
if (ch <= 0x7f)
|
||||
codepoint = ch;
|
||||
else if (ch <= 0xbf)
|
||||
codepoint = (codepoint << 6) | (ch & 0x3f);
|
||||
else if (ch <= 0xdf)
|
||||
codepoint = ch & 0x1f;
|
||||
else if (ch <= 0xef)
|
||||
codepoint = ch & 0x0f;
|
||||
else
|
||||
codepoint = ch & 0x07;
|
||||
++in;
|
||||
if (((*in & 0xc0) != 0x80) && (codepoint <= 0x10ffff))
|
||||
{
|
||||
if (codepoint <= 255)
|
||||
{
|
||||
out += (char)codepoint;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (codepoint > 0x400)
|
||||
out += (char)(codepoint - 0x360);
|
||||
}
|
||||
}
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
public:
|
||||
Nextion(String parameters) : IoTUart(parameters)
|
||||
{
|
||||
_url = jsonReadStr(parameters, "url");
|
||||
_url = "/" + _url;
|
||||
_host = jsonReadStr(parameters, "host");
|
||||
jsonRead(parameters, "rx", _rx);
|
||||
jsonRead(parameters, "tx", _tx);
|
||||
jsonRead(parameters, "speed", _speed);
|
||||
jsonRead(parameters, "line", _line);
|
||||
jsonRead(parameters, "uploadTelegram", _UpTelegram);
|
||||
}
|
||||
|
||||
IoTValue execute(String command, std::vector<IoTValue> ¶m)
|
||||
{
|
||||
|
||||
if (command == "Update")
|
||||
{
|
||||
updateServer();
|
||||
}
|
||||
else if (command == "printFFF")
|
||||
{
|
||||
if (param.size() == 2)
|
||||
//UART.printFFF("auto.val=1",0)
|
||||
{
|
||||
String strToUart = "";
|
||||
strToUart = param[0].valS;
|
||||
|
||||
if (param[1].valD)
|
||||
uartPrintFFF("\"" + strToUart + "\"");
|
||||
else
|
||||
uartPrintFFF(strToUart);
|
||||
}
|
||||
// отправка данных на Nextion - UART.printFFF("t1.txt=", ID_vidget + " °", 1);
|
||||
// или UART.printRusFFF("buttons.bt0.txt="," Гостинная",1);
|
||||
if (param.size() == 3)
|
||||
{
|
||||
String strToUart = "";
|
||||
strToUart = param[0].valS;
|
||||
|
||||
if (param[2].valD)
|
||||
uartPrintFFF(strToUart + "\"" + param[1].valS + "\"");
|
||||
else
|
||||
uartPrintFFF(strToUart + param[1].valS);
|
||||
}
|
||||
}
|
||||
// отправка кирилических символов на Nextion (русские буквы)
|
||||
else if (command == "printRusFFF")
|
||||
{
|
||||
if (param.size() == 2)
|
||||
{
|
||||
String strToUart = "";
|
||||
strToUart = param[0].valS;
|
||||
|
||||
if (param[1].valD)
|
||||
uartPrintFFF(convertRUS("\"" + strToUart + "\""));
|
||||
else
|
||||
uartPrintFFF(convertRUS(strToUart));
|
||||
}
|
||||
if (param.size() == 3)
|
||||
{
|
||||
String strToUart = "";
|
||||
strToUart = param[0].valS;
|
||||
|
||||
if (param[2].valD)
|
||||
uartPrintFFF(convertRUS(strToUart + "\"" + param[1].valS + "\""));
|
||||
else
|
||||
uartPrintFFF(convertRUS(strToUart + param[1].valS));
|
||||
}
|
||||
}// else { // не забываем, что переопределяем execute и нужно проверить что в базовом классе проверяется
|
||||
// return IoTUart::execute(command, param);
|
||||
// }
|
||||
return {};
|
||||
}
|
||||
|
||||
void onModuleOrder(String &key, String &value) {
|
||||
if (key == "uploadServer") {
|
||||
updateServer();
|
||||
}
|
||||
}
|
||||
|
||||
void uartPrintFFF(const String& msg) {
|
||||
if (_myUART) {
|
||||
SerialPrint("I", F("Nextion"), "uartPrintFFF -> "+msg+" +FFFFFF");
|
||||
_myUART->print(msg);
|
||||
_myUART->write(0xff);
|
||||
_myUART->write(0xff);
|
||||
_myUART->write(0xff);
|
||||
}
|
||||
}
|
||||
//---------------------NEXTION-UART---START------------------------
|
||||
void uartHandle() {
|
||||
if (!_myUART) return;
|
||||
if (_myUART->available()) {
|
||||
_inc = _myUART->read();
|
||||
if (_inc == 0xFF) {
|
||||
_inc = _myUART->read();
|
||||
_inc = _myUART->read();
|
||||
_inStr = "";
|
||||
return;
|
||||
}
|
||||
|
||||
if (_inc == '\r') return;
|
||||
|
||||
if (_inc == '\n') {
|
||||
if (_inStr.indexOf("=") == -1) { // если входящее сообщение не по формату, то работаем как в режиме 0
|
||||
setValue(_inStr);
|
||||
return;
|
||||
}
|
||||
String id = selectToMarker(_inStr, "=");
|
||||
String valStr = selectToMarkerLast(_inStr, "=");
|
||||
valStr.replace("\"", "");
|
||||
id.replace(".val", "_val");
|
||||
id.replace(".txt", "_txt");
|
||||
generateOrder(id, valStr);
|
||||
_inStr = "";
|
||||
} else _inStr += _inc;
|
||||
}
|
||||
}
|
||||
|
||||
void onRegEvent(IoTItem* eventItem) {
|
||||
if (!_myUART || !eventItem) return;
|
||||
int indexOf_;
|
||||
String printStr = "";
|
||||
|
||||
printStr += eventItem->getID();
|
||||
indexOf_ = printStr.indexOf("_");
|
||||
if (indexOf_ == -1) return; // пропускаем событие, если нет используемого признака типа данных - _txt или _vol
|
||||
|
||||
if (printStr.indexOf("_txt") > 0) {
|
||||
printStr.replace("_txt", ".txt=\"");
|
||||
printStr += eventItem->getValue();
|
||||
printStr += "\"";
|
||||
} else if (printStr.indexOf("_val") > 0) {
|
||||
printStr += eventItem->getValue();
|
||||
printStr.replace(".", "");
|
||||
printStr.replace("_val", ".val=");
|
||||
} else {
|
||||
if (indexOf_ == printStr.length()-1) printStr.replace("_", "");
|
||||
else printStr.replace("_", ".");
|
||||
printStr += "=";
|
||||
printStr += eventItem->getValue();
|
||||
}
|
||||
|
||||
uartPrintFFF(convertRUS(printStr));
|
||||
}
|
||||
|
||||
//---------------------NEXTION-UART---END------------------------
|
||||
|
||||
//---------------------NEXTION-UPDATE---START------------------------
|
||||
void updateServer()
|
||||
{
|
||||
SerialPrint("I", F("NextionUpdate"), "Update .... ");
|
||||
|
||||
if (!updated)
|
||||
{
|
||||
SerialPrint("I", F("NextionUpdate"), "connecting to " + (String)_host);
|
||||
HTTPClient http;
|
||||
#if defined ESP8266
|
||||
if (!http.begin(_host, 80, _url))
|
||||
SerialPrint("I", F("NextionUpdate"), "connection failed ");
|
||||
#elif defined ESP32
|
||||
if (!http.begin(String("http://") + _host + _url))
|
||||
SerialPrint("I", F("NextionUpdate"), "connection failed ");
|
||||
#endif
|
||||
|
||||
SerialPrint("I", F("NextionUpdate"), "Requesting file: " + (String)_url);
|
||||
int code = http.GET();
|
||||
// Update the nextion display
|
||||
if (code == 200)
|
||||
flashNextion(http);
|
||||
else
|
||||
SerialPrint("I", F("NextionUpdate"), "HTTP error: " + (String)http.errorToString(code).c_str());
|
||||
|
||||
http.end();
|
||||
SerialPrint("I", F("NextionUpdate"), "Closing connection ");
|
||||
}
|
||||
}
|
||||
|
||||
void uploadNextionTlgrm(String &url)
|
||||
{
|
||||
if (!_UpTelegram)
|
||||
return;
|
||||
if (!updated)
|
||||
{
|
||||
SerialPrint("I", F("NextionUpdate"), "connecting to " + url);
|
||||
|
||||
HTTPClient http;
|
||||
|
||||
#ifdef ESP8266
|
||||
SerialPrint("I", F("NextionUpdate"), "Update impossible esp8266: Change boards to esp32 :)");
|
||||
return;
|
||||
#else
|
||||
if (!http.begin(url)) // пингуем файл
|
||||
SerialPrint("I", F("NextionUpdate"), "connection failed ");
|
||||
#endif
|
||||
SerialPrint("I", F("NextionUpdate"), "Requesting file: OK" );
|
||||
int code = http.GET();
|
||||
// Update the nextion display
|
||||
if (code == 200)
|
||||
flashNextion(http);
|
||||
else
|
||||
SerialPrint("I", F("NextionUpdate"), "HTTP error: " + (String)http.errorToString(code).c_str());
|
||||
|
||||
http.end();
|
||||
SerialPrint("I", F("NextionUpdate"), "Closing connection ");
|
||||
}
|
||||
}
|
||||
|
||||
void flashNextion(HTTPClient &http)
|
||||
{
|
||||
int contentLength = http.getSize();
|
||||
SerialPrint("I", F("NextionUpdate"), "File received. Update Nextion... ");
|
||||
bool result;
|
||||
ESPNexUpload nexUp(_speed, _line, _rx, _tx);
|
||||
nexUp.setUpdateProgressCallback([]()
|
||||
{ SerialPrint("I", F("NextionUpdate"), "... "); });
|
||||
|
||||
result = nexUp.prepareUpload(contentLength);
|
||||
if (!result)
|
||||
{
|
||||
SerialPrint("I", F("NextionUpdate"), "Error: " + (String)nexUp.statusMessage);
|
||||
}
|
||||
else
|
||||
{
|
||||
SerialPrint("I", F("NextionUpdate"), "Start upload. File size is: " + (String)contentLength);
|
||||
result = nexUp.upload(*http.getStreamPtr());
|
||||
if (result)
|
||||
{
|
||||
updated = true;
|
||||
SerialPrint("I", F("NextionUpdate"), "Succesfully updated Nextion! ");
|
||||
}
|
||||
else
|
||||
{
|
||||
SerialPrint("I", F("NextionUpdate"), "Error updating Nextion: " + (String)nexUp.statusMessage);
|
||||
}
|
||||
nexUp.end();
|
||||
}
|
||||
}
|
||||
//---------------------NEXTION-UPDATE---END------------------------
|
||||
|
||||
~Nextion(){};
|
||||
|
||||
};
|
||||
|
||||
void *getAPI_Nextion(String subtype, String param)
|
||||
{
|
||||
if (subtype == F("Nextion"))
|
||||
{
|
||||
return new Nextion(param);
|
||||
}
|
||||
else
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
98
src/modules/display/Nextion/modinfo.json
Normal file
98
src/modules/display/Nextion/modinfo.json
Normal file
@@ -0,0 +1,98 @@
|
||||
{
|
||||
"menuSection": "screens",
|
||||
"configItem": [
|
||||
{
|
||||
"global": 0,
|
||||
"name": "Nextion",
|
||||
"type": "Reading",
|
||||
"subtype": "Nextion",
|
||||
"id": "nex",
|
||||
"widget": "",
|
||||
"page": "",
|
||||
"descr": "",
|
||||
"host": "192.168.1.10:5500",
|
||||
"url": "nextion.tft",
|
||||
"btn-uploadServer": "",
|
||||
"tx": 17,
|
||||
"rx": 16,
|
||||
"line": 2,
|
||||
"speed": 9600,
|
||||
"uploadTelegram": 1
|
||||
}
|
||||
],
|
||||
"about": {
|
||||
"authorName": "Bubnov Mikhail",
|
||||
"authorContact": "https://t.me/Mit4bmw",
|
||||
"authorGit": "https://github.com/Mit4el",
|
||||
"specialThanks": "",
|
||||
"moduleName": "Nextion",
|
||||
"moduleVersion": "2.0",
|
||||
"usedRam": {
|
||||
"esp32_4mb": 15,
|
||||
"esp8266_4mb": 15
|
||||
},
|
||||
"title": "Nextion",
|
||||
"moduleDesc": "загрузка прошивки в дисплей Nextion. Команда для запуска обновления дисплея: Nextion.Update(); ",
|
||||
"propInfo": {
|
||||
"tx": "TX пин",
|
||||
"rx": "RX пин",
|
||||
"speed": "Скорость UART",
|
||||
"line": "Актуально только для ESP32: номер линии hardUART. =2 rx=16 tx=17, для SoftwarwSerial в ESP32 line = -1",
|
||||
"host": "Сервер обновления. Можно использовать LiveServer из VisualCode, указывать ip адрес",
|
||||
"url": "файл прошивки экрана, указывать с расширением, например nextion.tft или iotm/test.tft",
|
||||
"uploadTelegram": "1 - разрешает прошивать экран через модуль Telegram_v2",
|
||||
"btn-uploadServer": "Кнопка загрузки прошивки с сервера LiveServer или другого по ip"
|
||||
},
|
||||
"funcInfo": [
|
||||
{
|
||||
"name": "Update",
|
||||
"descr": "Функция сценария для загрузки прошивки с сервера LiveServer или другого по ip",
|
||||
"params": []
|
||||
},
|
||||
{
|
||||
"name": "printFFF",
|
||||
"descr": "Отправить в UART текстовую строку и hex метку 3 байта 0xFF0xFF0xFF. Напимер nex.printFFF(\"auto.val=1\",0)",
|
||||
"params": [
|
||||
"Строка текста",
|
||||
"1 - обернуть строку в кавычки, 0 - отправить без кавычек"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "printFFF",
|
||||
"descr": "Отправить в UART текстовую строку и hex метку 3 байта 0xFF0xFF0xFF. Напимер nex.printFFF(\"t1.txt=\", ID_vidget + \" °\", 1);",
|
||||
"params": [
|
||||
"Строка текста",
|
||||
"ID Виджета или любое значение",
|
||||
"1 - обернуть строку в кавычки, 0 - отправить без кавычек"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "printRusFFF",
|
||||
"descr": "Отправить в UART текстовую строку и hex метку 3 байта 0xFF0xFF0xFF. С предварительной конвертацией русских букв (преобразуем в кодировку ISO-8859-5)",
|
||||
"params": [
|
||||
"Строка текста",
|
||||
"1 - обернуть строку в кавычки, 0 - отправить без кавычек"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "printRusFFF",
|
||||
"descr": "Отправить в UART текстовую строку и hex метку 3 байта 0xFF0xFF0xFF. С предварительной конвертацией русских букв (преобразуем в кодировку ISO-8859-5)",
|
||||
"params": [
|
||||
"Строка текста",
|
||||
"ID Виджета или любое значение",
|
||||
"1 - обернуть строку в кавычки, 0 - отправить без кавычек"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"defActive": false,
|
||||
"usedLibs": {
|
||||
"esp32_4mb": [],
|
||||
"esp32_4mb3f": [],
|
||||
"esp8266_4mb": [],
|
||||
"esp8266_1mb": [],
|
||||
"esp8266_1mb_ota": [],
|
||||
"esp8285_1mb": [],
|
||||
"esp8285_1mb_ota": []
|
||||
}
|
||||
}
|
||||
@@ -56,6 +56,7 @@
|
||||
"esp32cam_4mb": [],
|
||||
"esp32_16mb": [],
|
||||
"esp32s2_4mb": [],
|
||||
"esp32c3m_4mb":[],
|
||||
"esp8266_4mb": [],
|
||||
"esp8266_16mb": [],
|
||||
"esp8266_1mb": [],
|
||||
|
||||
@@ -89,6 +89,9 @@
|
||||
"esp32cam_4mb": [
|
||||
"adafruit/Adafruit BME280 Library"
|
||||
],
|
||||
"esp32c3m_4mb":[
|
||||
"adafruit/Adafruit BME280 Library"
|
||||
],
|
||||
"esp8266_4mb": [
|
||||
"adafruit/Adafruit BME280 Library"
|
||||
],
|
||||
|
||||
315
src/modules/sensors/Pzem004t_v2/PZEMSensor.cpp
Normal file
315
src/modules/sensors/Pzem004t_v2/PZEMSensor.cpp
Normal file
@@ -0,0 +1,315 @@
|
||||
#include "PZEMSensor.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#define REG_VOLTAGE 0x0000
|
||||
#define REG_CURRENT_L 0x0001
|
||||
#define REG_CURRENT_H 0X0002
|
||||
#define REG_POWER_L 0x0003
|
||||
#define REG_POWER_H 0x0004
|
||||
#define REG_ENERGY_L 0x0005
|
||||
#define REG_ENERGY_H 0x0006
|
||||
#define REG_FREQUENCY 0x0007
|
||||
#define REG_PF 0x0008
|
||||
#define REG_ALARM 0x0009
|
||||
#define CMD_RHR 0x03
|
||||
#define CMD_RIR 0X04
|
||||
#define CMD_WSR 0x06
|
||||
#define CMD_CAL 0x41
|
||||
#define CMD_REST 0x42
|
||||
#define WREG_ALARM_THR 0x0001
|
||||
#define WREG_ADDR 0x0002
|
||||
#define UPDATE_TIME 200
|
||||
#define RESPONSE_SIZE 32
|
||||
#define READ_TIMEOUT 100
|
||||
#define PZEM_BAUD_RATE 9600
|
||||
|
||||
#define DEBUG
|
||||
// Debugging function;
|
||||
void printBuf(uint8_t *buffer, uint16_t len) {
|
||||
#ifdef DEBUG
|
||||
for (uint16_t i = 0; i < len; i++) {
|
||||
char temp[6];
|
||||
sprintf(temp, "%.2x ", buffer[i]);
|
||||
Serial.print(temp);
|
||||
}
|
||||
Serial.println();
|
||||
#endif
|
||||
}
|
||||
|
||||
PZEMSensor::PZEMSensor(Stream *port, uint16_t addr) {
|
||||
_serial = port;
|
||||
_addr = addr;
|
||||
init();
|
||||
}
|
||||
|
||||
PZEM_Info *PZEMSensor::values(bool &online) {
|
||||
// Update vales if necessary
|
||||
if (!refresh()) {
|
||||
_values = PZEM_Info();
|
||||
online = false;
|
||||
} else {
|
||||
online = true;
|
||||
}
|
||||
return &_values;
|
||||
}
|
||||
|
||||
/*!
|
||||
* PZEM004Tv30::sendCmd8
|
||||
*
|
||||
* Prepares the 8 byte command buffer and sends
|
||||
*
|
||||
* @param[in] cmd - Command to send (position 1)
|
||||
* @param[in] rAddr - Register address (postion 2-3)
|
||||
* @param[in] val - Register value to write (positon 4-5)
|
||||
* @param[in] check - perform a simple read check after write
|
||||
*
|
||||
* @return success
|
||||
*/
|
||||
bool PZEMSensor::sendCmd8(uint8_t cmd, uint16_t rAddr, uint16_t val, bool check, uint16_t slave_addr) {
|
||||
uint8_t sendBuffer[8]; // Send buffer
|
||||
uint8_t respBuffer[8]; // Response buffer (only used when check is true)
|
||||
|
||||
if ((slave_addr == 0xFFFF) ||
|
||||
(slave_addr < 0x01) ||
|
||||
(slave_addr > 0xF7)) {
|
||||
slave_addr = _addr;
|
||||
}
|
||||
|
||||
sendBuffer[0] = slave_addr; // Set slave address
|
||||
sendBuffer[1] = cmd; // Set command
|
||||
|
||||
sendBuffer[2] = (rAddr >> 8) & 0xFF; // Set high byte of register address
|
||||
sendBuffer[3] = (rAddr)&0xFF; // Set low byte =//=
|
||||
|
||||
sendBuffer[4] = (val >> 8) & 0xFF; // Set high byte of register value
|
||||
sendBuffer[5] = (val)&0xFF; // Set low byte =//=
|
||||
|
||||
setCRC(sendBuffer, 8); // Set CRC of frame
|
||||
|
||||
_serial->write(sendBuffer, 8); // send frame
|
||||
|
||||
if (check) {
|
||||
if (!recieve(respBuffer, 8)) { // if check enabled, read the response
|
||||
return false;
|
||||
}
|
||||
|
||||
// Check if response is same as send
|
||||
for (uint8_t i = 0; i < 8; i++) {
|
||||
if (sendBuffer[i] != respBuffer[i])
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool PZEMSensor::setAddress(uint8_t addr) {
|
||||
if (addr < 0x01 || addr > 0xF7) // sanity check
|
||||
return false;
|
||||
|
||||
// Write the new address to the address register
|
||||
if (!sendCmd8(CMD_WSR, WREG_ADDR, addr, true))
|
||||
return false;
|
||||
|
||||
_addr = addr; // If successful, update the current slave address
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
uint8_t PZEMSensor::getAddress() {
|
||||
return _addr;
|
||||
}
|
||||
|
||||
bool PZEMSensor::setPowerAlarm(uint16_t watts) {
|
||||
if (watts > 25000) { // Sanitych check
|
||||
watts = 25000;
|
||||
}
|
||||
|
||||
// Write the watts threshold to the Alarm register
|
||||
if (!sendCmd8(CMD_WSR, WREG_ALARM_THR, watts, true))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool PZEMSensor::getPowerAlarm() {
|
||||
if (!refresh()) // Update vales if necessary
|
||||
return NAN; // Update did not work, return NAN
|
||||
|
||||
return _values.alarms != 0x0000;
|
||||
}
|
||||
|
||||
void PZEMSensor::init() {
|
||||
if (_addr < 0x01 || _addr > 0xF8) {
|
||||
// Sanity check of address
|
||||
_addr = PZEM_DEFAULT_ADDR;
|
||||
}
|
||||
// Set initial lastRed time so that we read right away
|
||||
_lastRead = 0;
|
||||
_lastRead -= UPDATE_TIME;
|
||||
}
|
||||
|
||||
bool PZEMSensor::refresh() {
|
||||
static uint8_t response[25];
|
||||
if (_lastRead + UPDATE_TIME > millis()) {
|
||||
return true;
|
||||
}
|
||||
// Read 10 registers starting at 0x00 (no check)
|
||||
sendCmd8(CMD_RIR, 0x00, 0x0A, false);
|
||||
if (recieve(response, 25) != 25) { // Something went wrong
|
||||
return false;
|
||||
}
|
||||
// Update the current values
|
||||
_values.voltage = ((uint32_t)response[3] << 8 | // Raw voltage in 0.1V
|
||||
(uint32_t)response[4]) /
|
||||
10.0;
|
||||
|
||||
_values.current = ((uint32_t)response[5] << 8 | // Raw current in 0.001A
|
||||
(uint32_t)response[6] |
|
||||
(uint32_t)response[7] << 24 |
|
||||
(uint32_t)response[8] << 16) /
|
||||
1000.0;
|
||||
|
||||
_values.power = ((uint32_t)response[9] << 8 | // Raw power in 0.1W
|
||||
(uint32_t)response[10] |
|
||||
(uint32_t)response[11] << 24 |
|
||||
(uint32_t)response[12] << 16) /
|
||||
10.0;
|
||||
|
||||
_values.energy = ((uint32_t)response[13] << 8 | // Raw Energy in 1Wh
|
||||
(uint32_t)response[14] |
|
||||
(uint32_t)response[15] << 24 |
|
||||
(uint32_t)response[16] << 16) /
|
||||
1000.0;
|
||||
|
||||
_values.freq = ((uint32_t)response[17] << 8 | // Raw Frequency in 0.1Hz
|
||||
(uint32_t)response[18]) /
|
||||
10.0;
|
||||
|
||||
_values.pf = ((uint32_t)response[19] << 8 | // Raw pf in 0.01
|
||||
(uint32_t)response[20]) /
|
||||
100.0;
|
||||
|
||||
_values.alarms = ((uint32_t)response[21] << 8 | // Raw alarm value
|
||||
(uint32_t)response[22]);
|
||||
|
||||
// Record current time as _lastRead
|
||||
_lastRead = millis();
|
||||
return true;
|
||||
}
|
||||
|
||||
bool PZEMSensor::reset() {
|
||||
uint8_t buffer[] = {0x00, CMD_REST, 0x00, 0x00};
|
||||
uint8_t reply[5];
|
||||
buffer[0] = _addr;
|
||||
|
||||
setCRC(buffer, 4);
|
||||
_serial->write(buffer, 4);
|
||||
|
||||
uint16_t length = recieve(reply, 5);
|
||||
|
||||
if (length == 0 || length == 5) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
uint16_t PZEMSensor::recieve(uint8_t *resp, uint16_t len) {
|
||||
((SoftwareSerial *)_serial)->listen(); // Start software serial listen
|
||||
unsigned long startTime = millis(); // Start time for Timeout
|
||||
uint8_t index = 0; // Bytes we have read
|
||||
while ((index < len) && (millis() - startTime < READ_TIMEOUT)) {
|
||||
if (_serial->available() > 0) {
|
||||
uint8_t c = (uint8_t)_serial->read();
|
||||
resp[index++] = c;
|
||||
}
|
||||
}
|
||||
// Check CRC with the number of bytes read
|
||||
if (!checkCRC(resp, index)) {
|
||||
return 0;
|
||||
}
|
||||
return index;
|
||||
}
|
||||
|
||||
bool PZEMSensor::checkCRC(const uint8_t *buf, uint16_t len) {
|
||||
if (len <= 2) // Sanity check
|
||||
return false;
|
||||
|
||||
uint16_t crc = CRC16(buf, len - 2); // Compute CRC of data
|
||||
return ((uint16_t)buf[len - 2] | (uint16_t)buf[len - 1] << 8) == crc;
|
||||
}
|
||||
|
||||
void PZEMSensor::setCRC(uint8_t *buf, uint16_t len) {
|
||||
if (len <= 2) // Sanity check
|
||||
return;
|
||||
|
||||
uint16_t crc = CRC16(buf, len - 2); // CRC of data
|
||||
|
||||
// Write high and low byte to last two positions
|
||||
buf[len - 2] = crc & 0xFF; // Low byte first
|
||||
buf[len - 1] = (crc >> 8) & 0xFF; // High byte second
|
||||
}
|
||||
|
||||
// Pre computed CRC table
|
||||
static const uint16_t crcTable[] PROGMEM = {
|
||||
0X0000, 0XC0C1, 0XC181, 0X0140, 0XC301, 0X03C0, 0X0280, 0XC241,
|
||||
0XC601, 0X06C0, 0X0780, 0XC741, 0X0500, 0XC5C1, 0XC481, 0X0440,
|
||||
0XCC01, 0X0CC0, 0X0D80, 0XCD41, 0X0F00, 0XCFC1, 0XCE81, 0X0E40,
|
||||
0X0A00, 0XCAC1, 0XCB81, 0X0B40, 0XC901, 0X09C0, 0X0880, 0XC841,
|
||||
0XD801, 0X18C0, 0X1980, 0XD941, 0X1B00, 0XDBC1, 0XDA81, 0X1A40,
|
||||
0X1E00, 0XDEC1, 0XDF81, 0X1F40, 0XDD01, 0X1DC0, 0X1C80, 0XDC41,
|
||||
0X1400, 0XD4C1, 0XD581, 0X1540, 0XD701, 0X17C0, 0X1680, 0XD641,
|
||||
0XD201, 0X12C0, 0X1380, 0XD341, 0X1100, 0XD1C1, 0XD081, 0X1040,
|
||||
0XF001, 0X30C0, 0X3180, 0XF141, 0X3300, 0XF3C1, 0XF281, 0X3240,
|
||||
0X3600, 0XF6C1, 0XF781, 0X3740, 0XF501, 0X35C0, 0X3480, 0XF441,
|
||||
0X3C00, 0XFCC1, 0XFD81, 0X3D40, 0XFF01, 0X3FC0, 0X3E80, 0XFE41,
|
||||
0XFA01, 0X3AC0, 0X3B80, 0XFB41, 0X3900, 0XF9C1, 0XF881, 0X3840,
|
||||
0X2800, 0XE8C1, 0XE981, 0X2940, 0XEB01, 0X2BC0, 0X2A80, 0XEA41,
|
||||
0XEE01, 0X2EC0, 0X2F80, 0XEF41, 0X2D00, 0XEDC1, 0XEC81, 0X2C40,
|
||||
0XE401, 0X24C0, 0X2580, 0XE541, 0X2700, 0XE7C1, 0XE681, 0X2640,
|
||||
0X2200, 0XE2C1, 0XE381, 0X2340, 0XE101, 0X21C0, 0X2080, 0XE041,
|
||||
0XA001, 0X60C0, 0X6180, 0XA141, 0X6300, 0XA3C1, 0XA281, 0X6240,
|
||||
0X6600, 0XA6C1, 0XA781, 0X6740, 0XA501, 0X65C0, 0X6480, 0XA441,
|
||||
0X6C00, 0XACC1, 0XAD81, 0X6D40, 0XAF01, 0X6FC0, 0X6E80, 0XAE41,
|
||||
0XAA01, 0X6AC0, 0X6B80, 0XAB41, 0X6900, 0XA9C1, 0XA881, 0X6840,
|
||||
0X7800, 0XB8C1, 0XB981, 0X7940, 0XBB01, 0X7BC0, 0X7A80, 0XBA41,
|
||||
0XBE01, 0X7EC0, 0X7F80, 0XBF41, 0X7D00, 0XBDC1, 0XBC81, 0X7C40,
|
||||
0XB401, 0X74C0, 0X7580, 0XB541, 0X7700, 0XB7C1, 0XB681, 0X7640,
|
||||
0X7200, 0XB2C1, 0XB381, 0X7340, 0XB101, 0X71C0, 0X7080, 0XB041,
|
||||
0X5000, 0X90C1, 0X9181, 0X5140, 0X9301, 0X53C0, 0X5280, 0X9241,
|
||||
0X9601, 0X56C0, 0X5780, 0X9741, 0X5500, 0X95C1, 0X9481, 0X5440,
|
||||
0X9C01, 0X5CC0, 0X5D80, 0X9D41, 0X5F00, 0X9FC1, 0X9E81, 0X5E40,
|
||||
0X5A00, 0X9AC1, 0X9B81, 0X5B40, 0X9901, 0X59C0, 0X5880, 0X9841,
|
||||
0X8801, 0X48C0, 0X4980, 0X8941, 0X4B00, 0X8BC1, 0X8A81, 0X4A40,
|
||||
0X4E00, 0X8EC1, 0X8F81, 0X4F40, 0X8D01, 0X4DC0, 0X4C80, 0X8C41,
|
||||
0X4400, 0X84C1, 0X8581, 0X4540, 0X8701, 0X47C0, 0X4680, 0X8641,
|
||||
0X8201, 0X42C0, 0X4380, 0X8341, 0X4100, 0X81C1, 0X8081, 0X4040};
|
||||
|
||||
uint16_t PZEMSensor::CRC16(const uint8_t *data, uint16_t len) {
|
||||
uint8_t nTemp; // CRC table index
|
||||
uint16_t crc = 0xFFFF; // Default value
|
||||
|
||||
while (len--) {
|
||||
nTemp = *data++ ^ crc;
|
||||
crc >>= 8;
|
||||
crc ^= (uint16_t)pgm_read_word(&crcTable[nTemp]);
|
||||
}
|
||||
return crc;
|
||||
}
|
||||
|
||||
bool PZEMSensor::search() {
|
||||
bool ret = false;
|
||||
static uint8_t response[7];
|
||||
for (uint16_t addr = 0x01; addr <= 0xF8; addr++) {
|
||||
sendCmd8(CMD_RIR, 0x00, 0x01, false, addr);
|
||||
if (recieve(response, 7) != 7) {
|
||||
// Something went wrong
|
||||
continue;
|
||||
} else {
|
||||
Serial.println("Pzem " + String(addr));
|
||||
ret = true;
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
51
src/modules/sensors/Pzem004t_v2/PZEMSensor.h
Normal file
51
src/modules/sensors/Pzem004t_v2/PZEMSensor.h
Normal file
@@ -0,0 +1,51 @@
|
||||
#pragma once
|
||||
|
||||
#include <Arduino.h>
|
||||
#include <SoftwareSerial.h>
|
||||
|
||||
#define PZEM_DEFAULT_ADDR 0xF8
|
||||
|
||||
struct PZEM_Info {
|
||||
float voltage;
|
||||
float current;
|
||||
float power;
|
||||
float energy;
|
||||
float freq;
|
||||
float pf;
|
||||
uint16_t alarms;
|
||||
PZEM_Info() : voltage{0}, current{0}, power{0}, energy{0}, freq{0}, pf{0}, alarms{0} {};
|
||||
};
|
||||
|
||||
class PZEMSensor {
|
||||
public:
|
||||
PZEMSensor(Stream *serial, uint16_t addr = PZEM_DEFAULT_ADDR);
|
||||
|
||||
~PZEMSensor();
|
||||
PZEM_Info *values(bool &online);
|
||||
bool setAddress(uint8_t addr);
|
||||
uint8_t getAddress();
|
||||
bool setPowerAlarm(uint16_t watts);
|
||||
bool getPowerAlarm();
|
||||
bool reset();
|
||||
bool search();
|
||||
// Get most up to date values from device registers and cache them
|
||||
bool refresh();
|
||||
void updateSerial(Stream *serial) {_serial = serial;}
|
||||
|
||||
private:
|
||||
void init(void);
|
||||
|
||||
private:
|
||||
PZEM_Info _values; // Measured values
|
||||
Stream *_serial; // Serial interface
|
||||
bool _isSoft; // Is serial interface software
|
||||
uint8_t _addr; // Device address
|
||||
uint64_t _lastRead; // Last time values were updated
|
||||
|
||||
void init(uint8_t addr); // Init common to all constructors
|
||||
uint16_t recieve(uint8_t *resp, uint16_t len); // Receive len bytes into a buffer
|
||||
bool sendCmd8(uint8_t cmd, uint16_t rAddr, uint16_t val, bool check = false, uint16_t slave_addr = 0xFFFF); // Send 8 byte command
|
||||
void setCRC(uint8_t *buf, uint16_t len); // Set the CRC for a buffer
|
||||
bool checkCRC(const uint8_t *buf, uint16_t len); // Check CRC of buffer
|
||||
uint16_t CRC16(const uint8_t *data, uint16_t len); // Calculate CRC of buffer
|
||||
};
|
||||
315
src/modules/sensors/Pzem004t_v2/Pzem004t.cpp
Normal file
315
src/modules/sensors/Pzem004t_v2/Pzem004t.cpp
Normal file
@@ -0,0 +1,315 @@
|
||||
|
||||
#include "Global.h"
|
||||
#include "classes/IoTItem.h"
|
||||
|
||||
#include "PZEMSensor.h"
|
||||
//#include "modules/sensors/UART/Uart.h"
|
||||
#include "classes/IoTUart.h"
|
||||
#include <map>
|
||||
|
||||
// глобальные списки необходимы для хранения объектов об экземплярах Pzem . Ключ - адрес
|
||||
std::map<String, PZEMSensor*> pzemSensorArray;
|
||||
//PZEMContainer _pzemCntr;
|
||||
Stream* _myUARTpzem = nullptr;
|
||||
|
||||
PZEMSensor* getPzemSensor(String addr) {
|
||||
if (pzemSensorArray.find(addr) == pzemSensorArray.end())
|
||||
return nullptr;
|
||||
return pzemSensorArray[addr];
|
||||
}
|
||||
|
||||
class Pzem004v : public IoTItem {
|
||||
private:
|
||||
String addr;
|
||||
PZEMSensor* pzem = nullptr;
|
||||
|
||||
public:
|
||||
Pzem004v(String parameters) : IoTItem(parameters) {
|
||||
jsonRead(parameters, "addr", addr);
|
||||
pzem = getPzemSensor(addr);
|
||||
}
|
||||
|
||||
void doByInterval() {
|
||||
if (pzem) {
|
||||
bool online = false;
|
||||
value.valD = pzem->values(online)->voltage;
|
||||
if (online) {
|
||||
regEvent(value.valD, "Pzem V");
|
||||
} else {
|
||||
regEvent(NAN, "Pzem V");
|
||||
SerialPrint("E", "Pzem", "V error", _id);
|
||||
}
|
||||
} else {
|
||||
regEvent(NAN, "Pzem");
|
||||
SerialPrint("E", "Pzem", "initialization error", _id);
|
||||
// Запросим pzem, если он не был создан из-за отсутствия UART, если в конфигурации не в правильном порядке
|
||||
pzem = getPzemSensor(addr);
|
||||
}
|
||||
}
|
||||
|
||||
~Pzem004v(){};
|
||||
};
|
||||
|
||||
class Pzem004a : public IoTItem {
|
||||
private:
|
||||
String addr;
|
||||
PZEMSensor* pzem = nullptr;
|
||||
|
||||
public:
|
||||
Pzem004a(String parameters) : IoTItem(parameters) {
|
||||
jsonRead(parameters, "addr", addr);
|
||||
pzem = getPzemSensor(addr);
|
||||
}
|
||||
|
||||
void doByInterval() {
|
||||
if (pzem) {
|
||||
bool online = false;
|
||||
value.valD = pzem->values(online)->current;
|
||||
if (online) {
|
||||
regEvent(value.valD, "Pzem A");
|
||||
} else {
|
||||
regEvent(NAN, "Pzem A");
|
||||
SerialPrint("E", "Pzem", "A error", _id);
|
||||
}
|
||||
} else {
|
||||
regEvent(NAN, "Pzem");
|
||||
SerialPrint("E", "Pzem", "initialization error", _id);
|
||||
pzem = getPzemSensor(addr);
|
||||
}
|
||||
}
|
||||
|
||||
~Pzem004a(){};
|
||||
};
|
||||
|
||||
class Pzem004w : public IoTItem {
|
||||
private:
|
||||
String addr;
|
||||
PZEMSensor* pzem = nullptr;
|
||||
|
||||
public:
|
||||
Pzem004w(String parameters) : IoTItem(parameters) {
|
||||
jsonRead(parameters, "addr", addr);
|
||||
pzem = getPzemSensor(addr);
|
||||
}
|
||||
|
||||
void doByInterval() {
|
||||
if (pzem) {
|
||||
bool online = false;
|
||||
value.valD = pzem->values(online)->power;
|
||||
if (online) {
|
||||
regEvent(value.valD, "Pzem W");
|
||||
} else {
|
||||
regEvent(NAN, "Pzem W");
|
||||
SerialPrint("E", "Pzem", "W error", _id);
|
||||
}
|
||||
} else {
|
||||
regEvent(NAN, "Pzem");
|
||||
SerialPrint("E", "Pzem", "initialization error", _id);
|
||||
pzem = getPzemSensor(addr);
|
||||
}
|
||||
}
|
||||
|
||||
~Pzem004w(){};
|
||||
};
|
||||
|
||||
class Pzem004wh : public IoTItem {
|
||||
private:
|
||||
String addr;
|
||||
PZEMSensor* pzem = nullptr;
|
||||
|
||||
public:
|
||||
Pzem004wh(String parameters) : IoTItem(parameters) {
|
||||
jsonRead(parameters, "addr", addr);
|
||||
pzem = getPzemSensor(addr);
|
||||
}
|
||||
|
||||
void doByInterval() {
|
||||
if (pzem) {
|
||||
bool online = false;
|
||||
value.valD = pzem->values(online)->energy;
|
||||
if (online) {
|
||||
regEvent(value.valD, "Pzem Wh");
|
||||
} else {
|
||||
regEvent(NAN, "Pzem Wh");
|
||||
SerialPrint("E", "Pzem", "Wh error", _id);
|
||||
}
|
||||
} else {
|
||||
regEvent(NAN, "Pzem");
|
||||
SerialPrint("E", "Pzem", "initialization error", _id);
|
||||
pzem = getPzemSensor(addr);
|
||||
}
|
||||
}
|
||||
|
||||
~Pzem004wh(){};
|
||||
};
|
||||
|
||||
class Pzem004hz : public IoTItem {
|
||||
private:
|
||||
String addr;
|
||||
PZEMSensor* pzem = nullptr;
|
||||
|
||||
public:
|
||||
Pzem004hz(String parameters) : IoTItem(parameters) {
|
||||
jsonRead(parameters, "addr", addr);
|
||||
pzem = getPzemSensor(addr);
|
||||
}
|
||||
|
||||
void doByInterval() {
|
||||
if (pzem) {
|
||||
bool online = false;
|
||||
value.valD = pzem->values(online)->freq;
|
||||
if (online) {
|
||||
regEvent(value.valD, "Pzem Hz");
|
||||
} else {
|
||||
regEvent(NAN, "Pzem Hz");
|
||||
SerialPrint("E", "Pzem", "Hz error", _id);
|
||||
}
|
||||
} else {
|
||||
regEvent(NAN, "Pzem");
|
||||
SerialPrint("E", "Pzem", "initialization error", _id);
|
||||
pzem = getPzemSensor(addr);
|
||||
}
|
||||
}
|
||||
|
||||
~Pzem004hz(){};
|
||||
};
|
||||
|
||||
class Pzem004pf : public IoTItem {
|
||||
private:
|
||||
String addr;
|
||||
PZEMSensor* pzem = nullptr;
|
||||
|
||||
public:
|
||||
Pzem004pf(String parameters) : IoTItem(parameters) {
|
||||
jsonRead(parameters, "addr", addr);
|
||||
pzem = getPzemSensor(addr);
|
||||
}
|
||||
|
||||
void doByInterval() {
|
||||
if (pzem) {
|
||||
bool online = false;
|
||||
value.valD = pzem->values(online)->pf;
|
||||
if (online) {
|
||||
regEvent(value.valD, "Pzem Pf");
|
||||
} else {
|
||||
regEvent(NAN, "Pzem Pf");
|
||||
SerialPrint("E", "Pzem", "Pf error", _id);
|
||||
}
|
||||
} else {
|
||||
regEvent(NAN, "Pzem");
|
||||
SerialPrint("E", "Pzem", "initialization error", _id);
|
||||
pzem = getPzemSensor(addr);
|
||||
}
|
||||
}
|
||||
|
||||
~Pzem004pf(){};
|
||||
};
|
||||
|
||||
class Pzem004cmd : public IoTItem {
|
||||
private:
|
||||
String addr;
|
||||
// int changeaddr;
|
||||
// String setaddr;
|
||||
// int reset;
|
||||
PZEMSensor* pzem = nullptr;
|
||||
|
||||
public:
|
||||
Pzem004cmd(String parameters) : IoTItem(parameters) {
|
||||
jsonRead(parameters, F("addr"), addr);
|
||||
// jsonRead(parameters, F("changeaddr"), changeaddr);
|
||||
// jsonRead(parameters, F("setaddr"), setaddr);
|
||||
// jsonRead(parameters, F("reset"), reset);
|
||||
|
||||
pzem = getPzemSensor(addr);
|
||||
}
|
||||
|
||||
void doByInterval() {
|
||||
if (pzem) {
|
||||
}
|
||||
}
|
||||
|
||||
void onModuleOrder(String &key, String &value) {
|
||||
if (pzem) {
|
||||
if (key == "changeaddr") {
|
||||
if (pzem->setAddress(hexStringToUint8(value))) {
|
||||
SerialPrint("i", "Pzem", "address set: " + value);
|
||||
} else {
|
||||
SerialPrint("i", "Pzem", "set adress error: " + value);
|
||||
}
|
||||
|
||||
} else if (key == "reset") {
|
||||
if (pzem->reset()) {
|
||||
SerialPrint("i", "Pzem", "reset done");
|
||||
} else {
|
||||
SerialPrint("i", "Pzem", "reset error");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
~Pzem004cmd(){};
|
||||
};
|
||||
|
||||
class Pzem004uart : public IoTUart {
|
||||
public:
|
||||
Pzem004uart(String parameters) : IoTUart(parameters) {
|
||||
_myUARTpzem = _myUART;
|
||||
//Обновим везде Uart, если в конфигурации не в правильном порядке
|
||||
for (auto it = pzemSensorArray.begin(); it != pzemSensorArray.end(); it ++)
|
||||
{
|
||||
if (it->second == nullptr){
|
||||
it->second = new PZEMSensor(_myUARTpzem, hexStringToUint8(it->first));
|
||||
// SerialPrint("i", "Pzem", "create pzemSensor");
|
||||
}
|
||||
it->second->updateSerial(_myUARTpzem);
|
||||
// SerialPrint("i", "Pzem", "update serial pzemuart");
|
||||
}
|
||||
}
|
||||
|
||||
~Pzem004uart(){};
|
||||
};
|
||||
|
||||
|
||||
|
||||
void* getAPI_Pzem004_v2(String subtype, String param) {
|
||||
|
||||
if (subtype == F("Pzem004v") || subtype == F("Pzem004a") || subtype == F("Pzem004w")
|
||||
|| subtype == F("Pzem004wh") || subtype == F("Pzem004hz") || subtype == F("Pzem004pf")
|
||||
|| subtype == F("Pzem004cmd") )
|
||||
{
|
||||
SerialPrint("i", "Pzem", "create constructor"+ subtype);
|
||||
String addr;
|
||||
jsonRead(param, "addr", addr);
|
||||
if (_myUARTpzem) {
|
||||
if (pzemSensorArray.find(addr) == pzemSensorArray.end()) {
|
||||
pzemSensorArray[addr] = new PZEMSensor(_myUARTpzem, hexStringToUint8(addr));
|
||||
// SerialPrint("i", "Pzem", "create map");
|
||||
} else { // Обновление UART нужно для смены пинов для уже созданных объектов в map
|
||||
pzemSensorArray[addr]->updateSerial(_myUARTpzem);
|
||||
// SerialPrint("i", "Pzem", "create serial constructor");
|
||||
}
|
||||
}else{// если нет UART, то и библиотеку pzem создаем пустой, что бы потом обновить при создании uart
|
||||
pzemSensorArray[addr] = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
if (subtype == F("Pzem004v")) {
|
||||
return new Pzem004v(param);
|
||||
} else if (subtype == F("Pzem004a")) {
|
||||
return new Pzem004a(param);
|
||||
} else if (subtype == F("Pzem004w")) {
|
||||
return new Pzem004w(param);
|
||||
} else if (subtype == F("Pzem004wh")) {
|
||||
return new Pzem004wh(param);
|
||||
} else if (subtype == F("Pzem004hz")) {
|
||||
return new Pzem004hz(param);
|
||||
} else if (subtype == F("Pzem004pf")) {
|
||||
return new Pzem004pf(param);
|
||||
} else if (subtype == F("Pzem004cmd")) {
|
||||
return new Pzem004cmd(param);
|
||||
} else if (subtype == F("Pzem004uart")) {
|
||||
return new Pzem004uart(param);
|
||||
} else {
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
155
src/modules/sensors/Pzem004t_v2/modinfo.json
Normal file
155
src/modules/sensors/Pzem004t_v2/modinfo.json
Normal file
@@ -0,0 +1,155 @@
|
||||
{
|
||||
"menuSection": "sensors",
|
||||
"configItem": [
|
||||
{
|
||||
"global": 0,
|
||||
"name": "PZEM 004t Напряжение",
|
||||
"type": "Reading",
|
||||
"subtype": "Pzem004v",
|
||||
"id": "v",
|
||||
"widget": "anydataVlt",
|
||||
"page": "PZEM",
|
||||
"descr": "Напряжение",
|
||||
"int": 15,
|
||||
"addr": "0xF8",
|
||||
"round": 1
|
||||
},
|
||||
{
|
||||
"global": 0,
|
||||
"name": "PZEM 004t Сила тока",
|
||||
"type": "Reading",
|
||||
"subtype": "Pzem004a",
|
||||
"id": "a",
|
||||
"widget": "anydataAmp",
|
||||
"page": "PZEM",
|
||||
"descr": "Сила тока",
|
||||
"int": 15,
|
||||
"addr": "0xF8",
|
||||
"round": 1
|
||||
},
|
||||
{
|
||||
"global": 0,
|
||||
"name": "PZEM 004t Мощность",
|
||||
"type": "Reading",
|
||||
"subtype": "Pzem004w",
|
||||
"id": "w",
|
||||
"widget": "anydataWt",
|
||||
"page": "PZEM",
|
||||
"descr": "Мощность",
|
||||
"int": 15,
|
||||
"addr": "0xF8",
|
||||
"round": 1
|
||||
},
|
||||
{
|
||||
"global": 0,
|
||||
"name": "PZEM 004t Энергия",
|
||||
"type": "Reading",
|
||||
"subtype": "Pzem004wh",
|
||||
"id": "wh",
|
||||
"widget": "anydataWth",
|
||||
"page": "PZEM",
|
||||
"descr": "Энергия",
|
||||
"int": 15,
|
||||
"addr": "0xF8",
|
||||
"round": 1
|
||||
},
|
||||
{
|
||||
"global": 0,
|
||||
"name": "PZEM 004t Частота",
|
||||
"type": "Reading",
|
||||
"subtype": "Pzem004hz",
|
||||
"id": "hz",
|
||||
"widget": "anydataHtz",
|
||||
"page": "PZEM",
|
||||
"descr": "Частота",
|
||||
"int": 15,
|
||||
"addr": "0xF8",
|
||||
"round": 1
|
||||
},
|
||||
{
|
||||
"global": 0,
|
||||
"name": "PZEM 004t Косинус",
|
||||
"type": "Reading",
|
||||
"subtype": "Pzem004pf",
|
||||
"id": "pf",
|
||||
"widget": "anydata",
|
||||
"page": "PZEM",
|
||||
"descr": "Косинус F",
|
||||
"int": 15,
|
||||
"addr": "0xF8",
|
||||
"round": 1
|
||||
},
|
||||
{
|
||||
"global": 0,
|
||||
"name": "PZEM настройка",
|
||||
"type": "Reading",
|
||||
"subtype": "Pzem004cmd",
|
||||
"id": "set",
|
||||
"widget": "nil",
|
||||
"page": "",
|
||||
"descr": "",
|
||||
"int": 15,
|
||||
"addr": "0xF8",
|
||||
"btn-changeaddr": "0x01",
|
||||
"btn-reset": ""
|
||||
},
|
||||
{
|
||||
"global": 0,
|
||||
"name": "PZEM uart",
|
||||
"type": "Reading",
|
||||
"subtype": "Pzem004uart",
|
||||
"id": "upzem",
|
||||
"widget": "nil",
|
||||
"page": "",
|
||||
"descr": "",
|
||||
"tx": 17,
|
||||
"rx": 16,
|
||||
"line": 2,
|
||||
"speed": 9600
|
||||
}
|
||||
],
|
||||
"about": {
|
||||
"authorName": "Dmitry Borisenko, v2 - Mit4bmw",
|
||||
"authorContact": "https://t.me/Dmitry_Borisenko",
|
||||
"authorGit": "https://github.com/DmitryBorisenko33",
|
||||
"specialThanks": "Serghei Crasnicov @Serghei63",
|
||||
"moduleName": "Pzem004_v2",
|
||||
"moduleVersion": "2.0",
|
||||
"usedRam": {
|
||||
"esp32_4mb": 15,
|
||||
"esp8266_4mb": 15
|
||||
},
|
||||
"subTypes": [
|
||||
"Pzem004v",
|
||||
"Pzem004a",
|
||||
"Pzem004w",
|
||||
"Pzem004wh",
|
||||
"Pzem004hz",
|
||||
"Pzem004pf",
|
||||
"Pzem004cmd",
|
||||
"Pzem004uart"
|
||||
],
|
||||
"title": "Счетчик электроэнергии PZEM 004 t версии 3.0 (с модбасом)",
|
||||
"moduleDesc": "Считает потраченную электроэнергию, измеряет напряжение, частоту, силу тока и прочие параметры. Возможно подключение трех счетчиков к одной esp для трехфазных сетей. Для этого нужно настроить разные адреса modbus в платах pzem. Для работы обязателен модуль Pzem004uart",
|
||||
"propInfo": {
|
||||
"addr": "Адрес modbus",
|
||||
"int": "Количество секунд между опросами датчика. Желателно устанавливать одинаковые интервалы для параметров (для одного адреса Pzem) что опрос происходил один раз, остальные из 500мс буфера.",
|
||||
"btn-changeaddr": " Будет установлен адрес указанный в setaddr. Смотрите в логе результат: [i] Pzem address set: 0x01 Новый адрес который нужно назначить",
|
||||
"btn-reset": "pzem будет сброшен к нулю. Смотрите в логе результат: [i] Pzem reset done"
|
||||
}
|
||||
},
|
||||
"defActive": true,
|
||||
"usedLibs": {
|
||||
"esp32_4mb": [],
|
||||
"esp32_4mb3f": [],
|
||||
"esp32cam_4mb": [],
|
||||
"esp32c3m_4mb": [],
|
||||
"esp8266_4mb": [],
|
||||
"esp8266_1mb": [],
|
||||
"esp8266_1mb_ota": [],
|
||||
"esp8285_1mb": [],
|
||||
"esp8285_1mb_ota": [],
|
||||
"esp8266_2mb": [],
|
||||
"esp8266_2mb_ota": []
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user