diff --git a/FeatureRequest.md b/FeatureRequest.md index 9a69ae69..5eddc5dc 100644 --- a/FeatureRequest.md +++ b/FeatureRequest.md @@ -11,6 +11,12 @@ ____ +#### #11 MQTT - configurable payload + +* https://github.com/jomjol/AI-on-the-edge-device/issues/344 + + + #### #10 Improve and bug fix logging of images * https://github.com/jomjol/AI-on-the-edge-device/issues/307 diff --git a/LICENSE b/LICENSE deleted file mode 100644 index f288702d..00000000 --- a/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/README.md b/README.md index dfe5c167..b3349577 100644 --- a/README.md +++ b/README.md @@ -45,9 +45,26 @@ In other cases you can contact the developer via email: isEnabled())) { -// printf("Use gpioHandler flashLigh\n"); + printf("Use gpioHandler flashLigh\n"); gpioHandler->flashLightEnable(status); } else { // Init the GPIO diff --git a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp index 7fe14743..f1ed5bfc 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp +++ b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp @@ -10,7 +10,7 @@ static const char* TAG = "flow_analog"; -bool debugdetailgeneral = false; +bool debugdetailgeneral = true; ClassFlowCNNGeneral::ClassFlowCNNGeneral(ClassFlowAlignment *_flowalign, t_CNNType _cnntype) : ClassFlowImage(NULL, TAG) { @@ -21,23 +21,23 @@ ClassFlowCNNGeneral::ClassFlowCNNGeneral(ClassFlowAlignment *_flowalign, t_CNNTy previousElement = NULL; SaveAllFiles = false; disabled = false; - extendedResolution = false; +// extendedResolution = false; isLogImageSelect = false; CNNType = AutoDetect; CNNType = _cnntype; flowpostalignment = _flowalign; } - +/* int ClassFlowCNNGeneral::AnzahlROIs(int _analog = 0) { int zw = GENERAL[_analog]->ROI.size(); if (extendedResolution && (CNNType != Digital)) zw++; // da letzte Ziffer inkl Nachhkomma, es sei denn, das Nachkomma gibt es nicht (Digital) return zw; } +*/ - -string ClassFlowCNNGeneral::getReadout(int _analog = 0) +string ClassFlowCNNGeneral::getReadout(int _analog = 0, bool _extendedResolution = false) { string result = ""; if (GENERAL[_analog]->ROI.size() == 0) @@ -45,20 +45,20 @@ string ClassFlowCNNGeneral::getReadout(int _analog = 0) if (CNNType == Analogue) { - float zahl = GENERAL[_analog]->ROI[GENERAL[_analog]->ROI.size() - 1]->result; + float zahl = GENERAL[_analog]->ROI[GENERAL[_analog]->ROI.size() - 1]->result_float; int ergebnis_nachkomma = ((int) floor(zahl * 10)) % 10; int prev = -1; - prev = ZeigerEval(GENERAL[_analog]->ROI[GENERAL[_analog]->ROI.size() - 1]->result, prev); + prev = ZeigerEval(GENERAL[_analog]->ROI[GENERAL[_analog]->ROI.size() - 1]->result_float, prev); result = std::to_string(prev); - if (extendedResolution && (CNNType != Digital)) + if (_extendedResolution && (CNNType != Digital)) result = result + std::to_string(ergebnis_nachkomma); for (int i = GENERAL[_analog]->ROI.size() - 2; i >= 0; --i) { - prev = ZeigerEval(GENERAL[_analog]->ROI[i]->result, prev); + prev = ZeigerEval(GENERAL[_analog]->ROI[i]->result_float, prev); result = std::to_string(prev) + result; } } @@ -67,10 +67,10 @@ string ClassFlowCNNGeneral::getReadout(int _analog = 0) { for (int i = 0; i < GENERAL[_analog]->ROI.size(); ++i) { - if (GENERAL[_analog]->ROI[i]->resultklasse == 10) + if (GENERAL[_analog]->ROI[i]->result_klasse >= 10) result = result + "N"; else - result = result + std::to_string(GENERAL[_analog]->ROI[i]->resultklasse); + result = result + std::to_string(GENERAL[_analog]->ROI[i]->result_klasse); } } @@ -79,10 +79,10 @@ string ClassFlowCNNGeneral::getReadout(int _analog = 0) // int ergebnis_nachkomma = -1; int zif_akt = -1; - float zahl = GENERAL[_analog]->ROI[GENERAL[_analog]->ROI.size() - 1]->result; + float zahl = GENERAL[_analog]->ROI[GENERAL[_analog]->ROI.size() - 1]->result_float; if (zahl >= 0) // NaN? { - if (extendedResolution) + if (_extendedResolution) { int ergebnis_nachkomma = ((int) floor(zahl * 10)) % 10; int ergebnis_vorkomma = ((int) floor(zahl)) % 10; @@ -91,22 +91,22 @@ string ClassFlowCNNGeneral::getReadout(int _analog = 0) } else { - zif_akt = ZeigerEvalHybrid(GENERAL[_analog]->ROI[GENERAL[_analog]->ROI.size() - 1]->result, -1, -1); + zif_akt = ZeigerEvalHybrid(GENERAL[_analog]->ROI[GENERAL[_analog]->ROI.size() - 1]->result_float, -1, -1); result = std::to_string(zif_akt); } } else { result = "N"; - if (extendedResolution && (CNNType != Digital)) + if (_extendedResolution && (CNNType != Digital)) result = "NN"; } for (int i = GENERAL[_analog]->ROI.size() - 2; i >= 0; --i) { - if (GENERAL[_analog]->ROI[i]->result >= 0) + if (GENERAL[_analog]->ROI[i]->result_float >= 0) { - zif_akt = ZeigerEvalHybrid(GENERAL[_analog]->ROI[i]->result, GENERAL[_analog]->ROI[i+1]->result, zif_akt); + zif_akt = ZeigerEvalHybrid(GENERAL[_analog]->ROI[i]->result_float, GENERAL[_analog]->ROI[i+1]->result_float, zif_akt); result = std::to_string(zif_akt) + result; } else @@ -117,7 +117,6 @@ string ClassFlowCNNGeneral::getReadout(int _analog = 0) } } - return result; } @@ -260,7 +259,7 @@ bool ClassFlowCNNGeneral::ReadParameter(FILE* pfile, string& aktparamgraph) neuroi->posy = std::stoi(zerlegt[2]); neuroi->deltax = std::stoi(zerlegt[3]); neuroi->deltay = std::stoi(zerlegt[4]); - neuroi->result = -1; + neuroi->result_float = -1; neuroi->image = NULL; neuroi->image_org = NULL; } @@ -271,13 +270,16 @@ bool ClassFlowCNNGeneral::ReadParameter(FILE* pfile, string& aktparamgraph) SaveAllFiles = true; } +/* if ((toUpper(zerlegt[0]) == "EXTENDEDRESOLUTION") && (zerlegt.size() > 1)) { if (toUpper(zerlegt[1]) == "TRUE") extendedResolution = true; } +*/ } + for (int _ana = 0; _ana < GENERAL.size(); ++_ana) for (int i = 0; i < GENERAL[_ana]->ROI.size(); ++i) { @@ -482,6 +484,7 @@ bool ClassFlowCNNGeneral::doNeuralNetwork(string time) default: printf("ERROR ERROR ERROR - tflite passt nicht zur Firmware - ERROR ERROR ERROR\n"); } +// flowpostprocessing->UpdateNachkommaDecimalShift(); } for (int _ana = 0; _ana < GENERAL.size(); ++_ana) @@ -503,27 +506,27 @@ bool ClassFlowCNNGeneral::doNeuralNetwork(string time) f1 = tflite->GetOutputValue(0); f2 = tflite->GetOutputValue(1); float result = fmod(atan2(f1, f2) / (M_PI * 2) + 2, 1); - GENERAL[_ana]->ROI[i]->result = result * 10; - printf("Result General(Analog)%i: %f\n", i, GENERAL[_ana]->ROI[i]->result); + GENERAL[_ana]->ROI[i]->result_float = result * 10; + printf("Result General(Analog)%i: %f\n", i, GENERAL[_ana]->ROI[i]->result_float); if (isLogImage) - LogImage(logPath, GENERAL[_ana]->ROI[i]->name, &GENERAL[_ana]->ROI[i]->result, NULL, time, GENERAL[_ana]->ROI[i]->image_org); + LogImage(logPath, GENERAL[_ana]->ROI[i]->name, &GENERAL[_ana]->ROI[i]->result_float, NULL, time, GENERAL[_ana]->ROI[i]->image_org); } break; case Digital: { - GENERAL[_ana]->ROI[i]->resultklasse = 0; - GENERAL[_ana]->ROI[i]->resultklasse = tflite->GetClassFromImageBasis(GENERAL[_ana]->ROI[i]->image); - printf("Result General(Digit)%i: %d\n", i, GENERAL[_ana]->ROI[i]->resultklasse); + GENERAL[_ana]->ROI[i]->result_klasse = 0; + GENERAL[_ana]->ROI[i]->result_klasse = tflite->GetClassFromImageBasis(GENERAL[_ana]->ROI[i]->image); + printf("Result General(Digit)%i: %d\n", i, GENERAL[_ana]->ROI[i]->result_klasse); if (isLogImage) { if (isLogImageSelect) { if (LogImageSelect.find(GENERAL[_ana]->ROI[i]->name) != std::string::npos) - LogImage(logPath, GENERAL[_ana]->ROI[i]->name, NULL, &GENERAL[_ana]->ROI[i]->resultklasse, time, GENERAL[_ana]->ROI[i]->image_org); + LogImage(logPath, GENERAL[_ana]->ROI[i]->name, NULL, &GENERAL[_ana]->ROI[i]->result_klasse, time, GENERAL[_ana]->ROI[i]->image_org); } else { - LogImage(logPath, GENERAL[_ana]->ROI[i]->name, NULL, &GENERAL[_ana]->ROI[i]->resultklasse, time, GENERAL[_ana]->ROI[i]->image_org); + LogImage(logPath, GENERAL[_ana]->ROI[i]->name, NULL, &GENERAL[_ana]->ROI[i]->result_klasse, time, GENERAL[_ana]->ROI[i]->image_org); } } } break; @@ -543,16 +546,16 @@ bool ClassFlowCNNGeneral::doNeuralNetwork(string time) if (debugdetailgeneral) LogFile.WriteToFile(_zwres); if ((_num == 10) || (_nachkomma == 10)) // NaN detektiert - GENERAL[_ana]->ROI[i]->result = -1; + GENERAL[_ana]->ROI[i]->result_float = -1; else - GENERAL[_ana]->ROI[i]->result = fmod((double) _num + (((double)_nachkomma)-5)/10 + (double) 10, 10); + GENERAL[_ana]->ROI[i]->result_float = fmod((double) _num + (((double)_nachkomma)-5)/10 + (double) 10, 10); - printf("Result General(DigitalHyprid)%i: %f\n", i, GENERAL[_ana]->ROI[i]->result); - _zwres = "Result General(DigitalHyprid)" + to_string(i) + ": " + to_string(GENERAL[_ana]->ROI[i]->result); + printf("Result General(DigitalHyprid)%i: %f\n", i, GENERAL[_ana]->ROI[i]->result_float); + _zwres = "Result General(DigitalHyprid)" + to_string(i) + ": " + to_string(GENERAL[_ana]->ROI[i]->result_float); if (debugdetailgeneral) LogFile.WriteToFile(_zwres); if (isLogImage) - LogImage(logPath, GENERAL[_ana]->ROI[i]->name, &GENERAL[_ana]->ROI[i]->result, NULL, time, GENERAL[_ana]->ROI[i]->image_org); + LogImage(logPath, GENERAL[_ana]->ROI[i]->name, &GENERAL[_ana]->ROI[i]->result_float, NULL, time, GENERAL[_ana]->ROI[i]->image_org); } break; default: break; @@ -567,7 +570,8 @@ bool ClassFlowCNNGeneral::doNeuralNetwork(string time) bool ClassFlowCNNGeneral::isExtendedResolution(int _number) { - if (extendedResolution && !(CNNType == Digital)) +// if (extendedResolution && !(CNNType == Digital)) + if (!(CNNType == Digital)) return true; return false; @@ -600,10 +604,10 @@ std::vector ClassFlowCNNGeneral::GetHTMLInfo() zw->filename_org = GENERAL[_ana]->name + "_" + GENERAL[_ana]->ROI[i]->name + ".jpg"; } - if (CNNType == Analogue) - zw->val = GENERAL[_ana]->ROI[i]->resultklasse; + if (CNNType == Digital) + zw->val = GENERAL[_ana]->ROI[i]->result_klasse; else - zw->val = GENERAL[_ana]->ROI[i]->result; + zw->val = GENERAL[_ana]->ROI[i]->result_float; zw->image = GENERAL[_ana]->ROI[i]->image; zw->image_org = GENERAL[_ana]->ROI[i]->image_org; diff --git a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.h b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.h index 2b2c7ac7..f06d7b72 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.h +++ b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.h @@ -1,6 +1,10 @@ -#pragma once -#include "ClassFlowImage.h" +#ifndef __CLASSCNNGENERAL__ +#define __CLASSCNNGENERAL__ + +#include"ClassFlowDefineTypes.h" #include "ClassFlowAlignment.h" +// #include "ClassFlowPostProcessing.h" + enum t_CNNType { AutoDetect, @@ -10,20 +14,6 @@ enum t_CNNType { None }; -struct roi { - int posx, posy, deltax, deltay; - float result; - int resultklasse; - string name; - CImageBasis *image, *image_org; -}; - -struct general { - string name; - std::vector ROI; -}; - - class ClassFlowCNNGeneral : public ClassFlowImage { @@ -36,8 +26,9 @@ protected: bool isLogImageSelect; string LogImageSelect; ClassFlowAlignment* flowpostalignment; +// ClassFlowPostProcessing *flowpostprocessing = NULL; bool SaveAllFiles; - bool extendedResolution; +// bool extendedResolution; int ZeigerEval(float zahl, int ziffer_vorgaenger); int ZeigerEvalHybrid(float zahl, float zahl_vorgaenger, int eval_vorgaenger); @@ -53,20 +44,22 @@ public: bool doFlow(string time); string getHTMLSingleStep(string host); - string getReadout(int _analog); + string getReadout(int _analog, bool _extendedResolution); void DrawROI(CImageBasis *_zw); std::vector GetHTMLInfo(); - int AnzahlROIs(int _analog); +// int AnzahlROIs(int _analog); int getAnzahlGENERAL(); general* GetGENERAL(int _analog); general* GetGENERAL(string _name, bool _create); general* FindGENERAL(string _name_number); string getNameGENERAL(int _analog); - bool isExtendedResolution(int _number = 0); + bool isExtendedResolution(int _number = 0); + +// void setPostprocessing(ClassFlowPostProcessing *_fpp){flowpostprocessing = _fpp;}; void UpdateNameNumbers(std::vector *_name_numbers); @@ -75,3 +68,5 @@ public: string name(){return "ClassFlowCNNGeneral";}; }; +#endif + diff --git a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp index e83dc491..f05f4963 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp +++ b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp @@ -76,12 +76,6 @@ std::string ClassFlowControll::TranslateAktstatus(std::string _input) std::vector ClassFlowControll::GetAllDigital() { -/* - for (int i = 0; i < FlowControll.size(); ++i) - if (FlowControll[i]->name().compare("ClassFlowCNNGeneral") == 0) - return ((ClassFlowCNNGeneral*) (FlowControll[i]))->GetHTMLInfo(); -*/ - if (flowdigit) { printf("ClassFlowControll::GetAllDigital - flowdigit != NULL\n"); diff --git a/code/components/jomjol_flowcontroll/ClassFlowControll.h b/code/components/jomjol_flowcontroll/ClassFlowControll.h index 339b496f..fbc1195f 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowControll.h +++ b/code/components/jomjol_flowcontroll/ClassFlowControll.h @@ -1,11 +1,11 @@ -#pragma once +#ifndef __FLOWCONTROLL__ +#define __FLOWCONTROLL__ #include #include "ClassFlow.h" #include "ClassFlowMakeImage.h" #include "ClassFlowAlignment.h" -//#include "ClassFlowDigit.h" #include "ClassFlowCNNGeneral.h" #include "ClassFlowPostProcessing.h" #include "ClassFlowMQTT.h" @@ -73,4 +73,6 @@ public: string name(){return "ClassFlowControll";}; }; +#endif + diff --git a/code/components/jomjol_flowcontroll/ClassFlowDefineTypes.h b/code/components/jomjol_flowcontroll/ClassFlowDefineTypes.h new file mode 100644 index 00000000..6295502b --- /dev/null +++ b/code/components/jomjol_flowcontroll/ClassFlowDefineTypes.h @@ -0,0 +1,52 @@ +#ifndef __CLASSFLOWIMAGE_CLASS__ +#define __CLASSFLOWIMAGE_CLASS__ + +#include "ClassFlowImage.h" + +struct roi { + int posx, posy, deltax, deltay; + float result_float; + int result_klasse; + string name; + CImageBasis *image, *image_org; +}; + +struct general { + string name; + std::vector ROI; +}; + + +struct NumberPost { + float MaxRateValue; + bool useMaxRateValue; + bool ErrorMessage; + bool PreValueOkay; + bool AllowNegativeRates; + bool checkDigitIncreaseConsistency; + time_t lastvalue; + string timeStamp; + float FlowRateAct; // m3 / min + float PreValue; // letzter Wert, der gut ausgelesen wurde + float Value; // letzer ausgelesener Wert, inkl. Korrekturen + string ReturnRawValue; // Rohwert (mit N & führenden 0) + string ReturnValue; // korrigierter Rückgabewert, ggf. mit Fehlermeldung + string ReturnPreValue; // korrigierter Rückgabewert ohne Fehlermeldung + string ReturnValueNoError; + string ErrorMessageText; // Fehlermeldung bei Consistency Check + int AnzahlAnalog; + int AnzahlDigital; + int DecimalShift; + int DecimalShiftInitial; + int Nachkomma; + + bool isExtendedResolution; + + general *digit_roi; + general *analog_roi; + + string name; +}; + +#endif + diff --git a/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp b/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp index b20ef9fc..4b0a9361 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp +++ b/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp @@ -1,5 +1,4 @@ #include "ClassFlowPostProcessing.h" - #include "Helper.h" #include "ClassFlowMakeImage.h" #include "ClassLogFile.h" @@ -124,7 +123,7 @@ bool ClassFlowPostProcessing::LoadPreValue(void) if (NUMBERS[j]->digit_roi || NUMBERS[j]->analog_roi) { - NUMBERS[j]->ReturnValue = RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->AnzahlAnalog - NUMBERS[j]->DecimalShift); + NUMBERS[j]->ReturnValue = RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->Nachkomma); NUMBERS[j]->ReturnValueNoError = NUMBERS[j]->ReturnValue; } } @@ -186,7 +185,7 @@ bool ClassFlowPostProcessing::LoadPreValue(void) if (NUMBERS[0]->digit_roi || NUMBERS[0]->analog_roi) { - NUMBERS[0]->ReturnValue = RundeOutput(NUMBERS[0]->Value, NUMBERS[0]->AnzahlAnalog - NUMBERS[0]->DecimalShift); + NUMBERS[0]->ReturnValue = RundeOutput(NUMBERS[0]->Value, NUMBERS[0]->Nachkomma); NUMBERS[0]->ReturnValueNoError = NUMBERS[0]->ReturnValue; } @@ -241,7 +240,6 @@ ClassFlowPostProcessing::ClassFlowPostProcessing(std::vector* lfc, C flowAnalog = _analog; flowDigit = _digit; - for (int i = 0; i < ListFlowControll->size(); ++i) { if (((*ListFlowControll)[i])->name().compare("ClassFlowMakeImage") == 0) @@ -251,6 +249,36 @@ ClassFlowPostProcessing::ClassFlowPostProcessing(std::vector* lfc, C } } +void ClassFlowPostProcessing::handleDecimalExtendedResolution(string _decsep, string _value) +{ + string _digit, _decpos; + int _pospunkt = _decsep.find_first_of("."); +// printf("Name: %s, Pospunkt: %d\n", _decsep.c_str(), _pospunkt); + if (_pospunkt > -1) + _digit = _decsep.substr(0, _pospunkt); + else + _digit = "default"; + + for (int j = 0; j < NUMBERS.size(); ++j) + { + bool _zwdc = false; + + if (toUpper(_value) == "TRUE") + _zwdc = true; + + if (_digit == "default") // erstmal auf default setzen (falls sonst nichts gesetzt) + { + NUMBERS[j]->isExtendedResolution = _zwdc; + } + + if (NUMBERS[j]->name == _digit) + { + NUMBERS[j]->isExtendedResolution = _zwdc; + } + } +} + + void ClassFlowPostProcessing::handleDecimalSeparator(string _decsep, string _value) { string _digit, _decpos; @@ -352,6 +380,11 @@ bool ClassFlowPostProcessing::ReadParameter(FILE* pfile, string& aktparamgraph) zerlegt = this->ZerlegeZeile(aktparamgraph); std::string _param = GetParameterName(zerlegt[0]); + if ((toUpper(_param) == "EXTENDEDRESOLUTION") && (zerlegt.size() > 1)) + { + handleDecimalExtendedResolution(zerlegt[0], zerlegt[1]); + } + if ((toUpper(_param) == "DECIMALSHIFT") && (zerlegt.size() > 1)) { handleDecimalSeparator(zerlegt[0], zerlegt[1]); @@ -463,6 +496,7 @@ void ClassFlowPostProcessing::InitNUMBERS() _number->useMaxRateValue = false; _number->DecimalShift = 0; _number->DecimalShiftInitial = 0; + _number->isExtendedResolution = false; _number->FlowRateAct = 0; // m3 / min @@ -557,26 +591,23 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) NUMBERS[j]->ReturnRawValue = ""; NUMBERS[j]->ErrorMessageText = ""; - if (flowAnalog) NUMBERS[j]->AnzahlAnalog = flowAnalog->AnzahlROIs(j); - if (flowDigit) NUMBERS[j]->AnzahlDigital = flowDigit->AnzahlROIs(j); - - if (flowDigit->isExtendedResolution()) - NUMBERS[j]->DecimalShift = NUMBERS[j]->DecimalShiftInitial - 1; - - NUMBERS[j]->Nachkomma = NUMBERS[j]->AnzahlAnalog - NUMBERS[j]->DecimalShift; - + UpdateNachkommaDecimalShift(); if (NUMBERS[j]->digit_roi) - NUMBERS[j]->ReturnRawValue = flowDigit->getReadout(j); + { + if (NUMBERS[j]->analog_roi) + NUMBERS[j]->ReturnRawValue = flowDigit->getReadout(j, false); + else + NUMBERS[j]->ReturnRawValue = flowDigit->getReadout(j, NUMBERS[j]->isExtendedResolution); // Extended Resolution nur falls es keine analogen Ziffern gibt + } if (NUMBERS[j]->digit_roi && NUMBERS[j]->analog_roi) NUMBERS[j]->ReturnRawValue = NUMBERS[j]->ReturnRawValue + "."; if (NUMBERS[j]->analog_roi) - NUMBERS[j]->ReturnRawValue = NUMBERS[j]->ReturnRawValue + flowAnalog->getReadout(j); + NUMBERS[j]->ReturnRawValue = NUMBERS[j]->ReturnRawValue + flowAnalog->getReadout(j, NUMBERS[j]->isExtendedResolution); NUMBERS[j]->ReturnRawValue = ShiftDecimal(NUMBERS[j]->ReturnRawValue, NUMBERS[j]->DecimalShift); -///////////////// SPEZIALFALL für User Gustl /////////////////////////////////////////////////////// if (IgnoreLeadingNaN) { while ((NUMBERS[j]->ReturnRawValue.length() > 1) && (NUMBERS[j]->ReturnRawValue[0] == 'N')) @@ -584,7 +615,6 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) NUMBERS[j]->ReturnRawValue.erase(0, 1); } } -//////////////////////////////////////////////////////////////////////////////////////////////////// rohwert = NUMBERS[j]->ReturnRawValue; @@ -622,13 +652,13 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) NUMBERS[j]->Value = checkDigitConsistency(NUMBERS[j]->Value, NUMBERS[j]->DecimalShift, NUMBERS[j]->analog_roi != NULL, NUMBERS[j]->PreValue); } - zwvalue = RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->AnzahlAnalog - NUMBERS[j]->DecimalShift); + zwvalue = RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->Nachkomma); if ((!NUMBERS[j]->AllowNegativeRates) && (NUMBERS[j]->Value < NUMBERS[j]->PreValue)) { NUMBERS[j]->ErrorMessageText = NUMBERS[j]->ErrorMessageText + "Neg. Rate - Read: " + zwvalue + " - Raw: " + NUMBERS[j]->ReturnRawValue + " - Pre: " + RundeOutput(NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma) + " "; NUMBERS[j]->Value = NUMBERS[j]->PreValue; - zwvalue = RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->AnzahlAnalog - NUMBERS[j]->DecimalShift); + zwvalue = RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->Nachkomma); } if (NUMBERS[j]->useMaxRateValue && (abs(NUMBERS[j]->Value - NUMBERS[j]->PreValue) > NUMBERS[j]->MaxRateValue)) @@ -663,6 +693,49 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) return true; } + +void ClassFlowPostProcessing::UpdateNachkommaDecimalShift() +{ + for (int j = 0; j < NUMBERS.size(); ++j) + { + if (NUMBERS[j]->digit_roi && !NUMBERS[j]->analog_roi) // es gibt nur digitale ziffern + { +// printf("Nurdigital\n"); + NUMBERS[j]->DecimalShift = NUMBERS[j]->DecimalShiftInitial; + + if (NUMBERS[j]->isExtendedResolution && flowDigit->isExtendedResolution()) // extended resolution ist an und soll auch bei dieser Ziffer verwendet werden + NUMBERS[j]->DecimalShift = NUMBERS[j]->DecimalShift-1; + + NUMBERS[j]->Nachkomma = -NUMBERS[j]->DecimalShift; + } + + if (!NUMBERS[j]->digit_roi && NUMBERS[j]->analog_roi) // es gibt nur analoge ziffern + { +// printf("Nur analog\n"); + NUMBERS[j]->DecimalShift = NUMBERS[j]->DecimalShiftInitial; + if (NUMBERS[j]->isExtendedResolution && flowAnalog->isExtendedResolution()) // extended resolution ist an und soll auch bei dieser Ziffer verwendet werden + NUMBERS[j]->DecimalShift = NUMBERS[j]->DecimalShift-1; + + NUMBERS[j]->Nachkomma = -NUMBERS[j]->DecimalShift; + } + + if (NUMBERS[j]->digit_roi && NUMBERS[j]->analog_roi) // digital + analog + { +// printf("Nur digital + analog\n"); + + NUMBERS[j]->Nachkomma = NUMBERS[j]->analog_roi->ROI.size(); + NUMBERS[j]->DecimalShift = NUMBERS[j]->DecimalShiftInitial; + + if (NUMBERS[j]->isExtendedResolution && flowAnalog->isExtendedResolution()) // extended resolution ist an und soll auch bei dieser Ziffer verwendet werden + NUMBERS[j]->Nachkomma = NUMBERS[j]->Nachkomma+1; + + } + + printf("UpdateNachkommaDecShift NUMBER%i: Nachkomma %i, DecShift %i\n", j, NUMBERS[j]->Nachkomma,NUMBERS[j]->DecimalShift); + } +} + + string ClassFlowPostProcessing::getReadout(int _number) { return NUMBERS[_number]->ReturnValue; diff --git a/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.h b/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.h index 7079fcc9..875ad58b 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.h +++ b/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.h @@ -1,45 +1,13 @@ -#pragma once +#ifndef __FLOWPOSTPROCESSING__ +#define __FLOWPOSTPROCESSING__ + #include "ClassFlow.h" #include "ClassFlowMakeImage.h" #include "ClassFlowCNNGeneral.h" -#include "ClassFlowCNNGeneral.h" - +#include "ClassFlowDefineTypes.h" #include - -struct NumberPost { - float MaxRateValue; - bool useMaxRateValue; - bool ErrorMessage; - bool PreValueOkay; - bool AllowNegativeRates; - bool checkDigitIncreaseConsistency; - time_t lastvalue; - string timeStamp; - float FlowRateAct; // m3 / min - float PreValue; // letzter Wert, der gut ausgelesen wurde - float Value; // letzer ausgelesener Wert, inkl. Korrekturen - string ReturnRawValue; // Rohwert (mit N & führenden 0) - string ReturnValue; // korrigierter Rückgabewert, ggf. mit Fehlermeldung - string ReturnPreValue; // korrigierter Rückgabewert ohne Fehlermeldung - string ReturnValueNoError; - string ErrorMessageText; // Fehlermeldung bei Consistency Check - int AnzahlAnalog; - int AnzahlDigital; - int DecimalShift; - int DecimalShiftInitial; - int Nachkomma; - - general *digit_roi; - general *analog_roi; - - string name; -}; - - - - class ClassFlowPostProcessing : public ClassFlow { @@ -70,6 +38,8 @@ protected: void InitNUMBERS(); void handleDecimalSeparator(string _decsep, string _value); void handleMaxRateValue(string _decsep, string _value); + void handleDecimalExtendedResolution(string _decsep, string _value); + public: @@ -86,8 +56,13 @@ public: void SavePreValue(); string GetPreValue(std::string _number = ""); void SetPreValue(float zw, string _numbers, bool _extern = false); + + void UpdateNachkommaDecimalShift(); + std::vector GetNumbers(){return NUMBERS;}; string name(){return "ClassFlowPostProcessing";}; }; + +#endif diff --git a/code/components/jomjol_tfliteclass/server_tflite.cpp b/code/components/jomjol_tfliteclass/server_tflite.cpp index 5df7da6c..458e169d 100644 --- a/code/components/jomjol_tfliteclass/server_tflite.cpp +++ b/code/components/jomjol_tfliteclass/server_tflite.cpp @@ -283,47 +283,48 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req) txt = txt + "Digital Counter:

"; httpd_resp_sendstr_chunk(req, txt.c_str()); - std::vector htmlinfo; - htmlinfo = tfliteflow.GetAllDigital(); - for (int i = 0; i < htmlinfo.size(); ++i) + std::vector htmlinfodig; + htmlinfodig = tfliteflow.GetAllDigital(); + for (int i = 0; i < htmlinfodig.size(); ++i) { if (tfliteflow.GetTypeDigital() == Digital) { - if (htmlinfo[i]->val == 10) + if (htmlinfodig[i]->val == 10) zw = "NaN"; else - zw = to_string((int) htmlinfo[i]->val); + zw = to_string((int) htmlinfodig[i]->val); - txt = "filename + "\"> " + zw; + txt = "filename + "\"> " + zw; } else { std::stringstream stream; - stream << std::fixed << std::setprecision(1) << htmlinfo[i]->val; + stream << std::fixed << std::setprecision(1) << htmlinfodig[i]->val; zw = stream.str(); - txt = "filename + "\"> " + zw; + txt = "filename + "\"> " + zw; } httpd_resp_sendstr_chunk(req, txt.c_str()); - delete htmlinfo[i]; + delete htmlinfodig[i]; } - htmlinfo.clear(); + htmlinfodig.clear(); txt = "

Analog Meter:

"; httpd_resp_sendstr_chunk(req, txt.c_str()); - htmlinfo = tfliteflow.GetAllAnalog(); - for (int i = 0; i < htmlinfo.size(); ++i) + std::vector htmlinfoana; + htmlinfoana = tfliteflow.GetAllAnalog(); + for (int i = 0; i < htmlinfoana.size(); ++i) { std::stringstream stream; - stream << std::fixed << std::setprecision(1) << htmlinfo[i]->val; + stream << std::fixed << std::setprecision(1) << htmlinfoana[i]->val; zw = stream.str(); - txt = "filename + "\"> " + zw; + txt = "filename + "\"> " + zw; httpd_resp_sendstr_chunk(req, txt.c_str()); - delete htmlinfo[i]; + delete htmlinfoana[i]; } - htmlinfo.clear(); + htmlinfoana.clear(); } diff --git a/code/main/version.cpp b/code/main/version.cpp index 063d8c9d..dbffed26 100644 --- a/code/main/version.cpp +++ b/code/main/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="19ca0d7"; -const char* GIT_TAG="v8.3.0"; +const char* GIT_REV="1e6eddc"; +const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2021-09-13 20:03"; \ No newline at end of file +const char* BUILD_TIME="2021-09-20 21:11"; \ No newline at end of file diff --git a/code/version.cpp b/code/version.cpp index 063d8c9d..dbffed26 100644 --- a/code/version.cpp +++ b/code/version.cpp @@ -1,4 +1,4 @@ -const char* GIT_REV="19ca0d7"; -const char* GIT_TAG="v8.3.0"; +const char* GIT_REV="1e6eddc"; +const char* GIT_TAG=""; const char* GIT_BRANCH="rolling"; -const char* BUILD_TIME="2021-09-13 20:03"; \ No newline at end of file +const char* BUILD_TIME="2021-09-20 21:11"; \ No newline at end of file diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin index d5c8cc57..787a772f 100644 Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 6bf8a353..a320d582 100644 Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ diff --git a/firmware/html.zip b/firmware/html.zip index 3ffbcee0..7601707f 100644 Binary files a/firmware/html.zip and b/firmware/html.zip differ diff --git a/sd-card/html/edit_config_param.html b/sd-card/html/edit_config_param.html index 59c2db79..a6bfe056 100644 --- a/sd-card/html/edit_config_param.html +++ b/sd-card/html/edit_config_param.html @@ -349,24 +349,6 @@ textarea { Time to keep the separated digit images (in days -"0" = forever) - - - - - - ExtendedResolution - - - - - - Enable to use the after point resolution for the last analog counter - - - ModelInputSize @@ -502,6 +484,41 @@ textarea { Maximum change of reading from one to the next readout + + + + + + ExtendedResolution + + + + + + Enable to use the after point resolution for the last analog counter + + + + + + + + + IgnoreLeadingNaN + + + + + + Leading "N"'s will be deleted before further processing + + @@ -1452,7 +1469,7 @@ function WriteParameter(_param, _category, _cat, _name, _optional, _number = -1) setEnabled(_cat+"_"+_name, false); } - EnDisableItem(_category[_cat]["enabled"], _param, _category, _cat, _name, _optional); + EnDisableItem(_category[_cat]["enabled"], _param, _category, _cat, _name, _optional, _number); } function InvertEnableItem(_cat, _param) @@ -1619,12 +1636,16 @@ function UpdateInputIndividual() { ReadParameter(param, "PostProcessing", "DecimalShift", true, NUNBERSAkt) ReadParameter(param, "PostProcessing", "MaxRateValue", true, NUNBERSAkt) + ReadParameter(param, "PostProcessing", "ExtendedResolution", true, NUNBERSAkt) + ReadParameter(param, "PostProcessing", "IgnoreLeadingNaN", true, NUNBERSAkt) } var sel = document.getElementById("Numbers_value1"); NUNBERSAkt = sel.selectedIndex; WriteParameter(param, category, "PostProcessing", "DecimalShift", true, NUNBERSAkt); WriteParameter(param, category, "PostProcessing", "MaxRateValue", true, NUNBERSAkt); + WriteParameter(param, category, "PostProcessing", "ExtendedResolution", true, NUNBERSAkt); + WriteParameter(param, category, "PostProcessing", "IgnoreLeadingNaN", true, NUNBERSAkt); } function UpdateInput() { @@ -1656,7 +1677,7 @@ function UpdateInput() { WriteParameter(param, category, "Analog", "Model", false); WriteParameter(param, category, "Analog", "LogImageLocation", true); WriteParameter(param, category, "Analog", "LogfileRetentionInDays", true); - WriteParameter(param, category, "Analog", "ExtendedResolution", true); +// WriteParameter(param, category, "Analog", "ExtendedResolution", true); WriteParameter(param, category, "Analog", "ModelInputSize", false); WriteParameter(param, category, "PostProcessing", "PreValueUse", true); @@ -1719,13 +1740,13 @@ function ReadParameterAll() ReadParameter(param, "Analog", "Model", false); ReadParameter(param, "Analog", "LogImageLocation", true); ReadParameter(param, "Analog", "LogfileRetentionInDays", true); - ReadParameter(param, "Analog", "ExtendedResolution", true); +// ReadParameter(param, "Analog", "ExtendedResolution", true); ReadParameter(param, "Analog", "ModelInputSize", false); ReadParameter(param, "PostProcessing", "PreValueUse", true); ReadParameter(param, "PostProcessing", "PreValueAgeStartup", true); ReadParameter(param, "PostProcessing", "AllowNegativeRates", true); - ReadParameter(param, "PostProcessing", "MaxRateValue", true); +// ReadParameter(param, "PostProcessing", "MaxRateValue", true); ReadParameter(param, "PostProcessing", "ErrorMessage", true); ReadParameter(param, "PostProcessing", "CheckDigitIncreaseConsistency", true); diff --git a/sd-card/html/readconfigparam.js b/sd-card/html/readconfigparam.js index 86eaa08e..0732cd26 100644 --- a/sd-card/html/readconfigparam.js +++ b/sd-card/html/readconfigparam.js @@ -54,7 +54,7 @@ function ParseConfig() { ParamAddValue(param, catname, "LogImageLocation"); ParamAddValue(param, catname, "LogfileRetentionInDays"); ParamAddValue(param, catname, "ModelInputSize", 2); - ParamAddValue(param, catname, "ExtendedResolution"); +// ParamAddValue(param, catname, "ExtendedResolution"); var catname = "Analog"; category[catname] = new Object(); @@ -65,7 +65,7 @@ function ParseConfig() { ParamAddValue(param, catname, "LogImageLocation"); ParamAddValue(param, catname, "LogfileRetentionInDays"); ParamAddValue(param, catname, "ModelInputSize", 2); - ParamAddValue(param, catname, "ExtendedResolution"); +// ParamAddValue(param, catname, "ExtendedResolution"); var catname = "PostProcessing"; category[catname] = new Object(); @@ -77,9 +77,11 @@ function ParseConfig() { ParamAddValue(param, catname, "PreValueAgeStartup"); ParamAddValue(param, catname, "AllowNegativeRates"); ParamAddValue(param, catname, "MaxRateValue", 1, true); + ParamAddValue(param, catname, "ExtendedResolution", 1, true); + ParamAddValue(param, catname, "IgnoreLeadingNaN", 1, true); ParamAddValue(param, catname, "ErrorMessage"); ParamAddValue(param, catname, "CheckDigitIncreaseConsistency"); - ParamAddValue(param, catname, "IgnoreLeadingNaN"); +// ParamAddValue(param, catname, "IgnoreLeadingNaN"); var catname = "MQTT"; category[catname] = new Object(); diff --git a/sd-card/html/version.txt b/sd-card/html/version.txt index c83418e8..95c4e8d2 100644 --- a/sd-card/html/version.txt +++ b/sd-card/html/version.txt @@ -1 +1 @@ -9.7.1 \ No newline at end of file +10.0.0 \ No newline at end of file diff --git a/sd-card/img_tmp/leer.txt b/sd-card/img_tmp/leer.txt new file mode 100644 index 00000000..e69de29b