fixed reuse of mbedtls

added tls read timeout
fix: https download offset
2021-01-18 16:12:53 +01:00 · 2021-01-18 13:40:34 +01:00 · 2021-01-08 22:29:33 +01:00 · 2021-01-04 17:03:18 +01:00 · 2021-01-03 18:19:54 +01:00 · 2021-01-03 12:15:12 +01:00
43 changed files with 451 additions and 8292 deletions
--- a/.gitignore
+++ b/.gitignore
@ -60,4 +60,3 @@ test/build/

 *.orig

-Doxygen/html/
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -2,5 +2,9 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)

+# (Not part of the boilerplate)
+# This example uses an extra component for common functions such as Wi-Fi and Ethernet connection.
+set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common)
+
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-project(mesh_ota)
+project(https-mbedtls)
--- a/2580
+++ b/2580
--- a/625
+++ b/625
@ -1,625 +0,0 @@
-GNU GENERAL PUBLIC LICENSE
-
-Version 3, 29 June 2007
-
-Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/>
-
-Everyone is permitted to copy and distribute verbatim copies of this license
-document, but changing it is not allowed.
-
-Preamble
-
-The GNU General Public License is a free, copyleft license for software and
-other kinds of works.
-
-The licenses for most software and other practical works are designed to take
-away your freedom to share and change the works. By contrast, the GNU General
-Public License is intended to guarantee your freedom to share and change all
-versions of a program--to make sure it remains free software for all its users.
-We, the Free Software Foundation, use the GNU General Public License for most
-of our software; it applies also to any other work released this way by its
-authors. You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price. Our
-General Public Licenses are designed to make sure that you have the freedom
-to distribute copies of free software (and charge for them if you wish), that
-you receive source code or can get it if you want it, that you can change
-the software or use pieces of it in new free programs, and that you know you
-can do these things.
-
-To protect your rights, we need to prevent others from denying you these rights
-or asking you to surrender the rights. Therefore, you have certain responsibilities
-if you distribute copies of the software, or if you modify it: responsibilities
-to respect the freedom of others.
-
-For example, if you distribute copies of such a program, whether gratis or
-for a fee, you must pass on to the recipients the same freedoms that you received.
-You must make sure that they, too, receive or can get the source code. And
-you must show them these terms so they know their rights.
-
-Developers that use the GNU GPL protect your rights with two steps: (1) assert
-copyright on the software, and (2) offer you this License giving you legal
-permission to copy, distribute and/or modify it.
-
-For the developers' and authors' protection, the GPL clearly explains that
-there is no warranty for this free software. For both users' and authors'
-sake, the GPL requires that modified versions be marked as changed, so that
-their problems will not be attributed erroneously to authors of previous versions.
-
-Some devices are designed to deny users access to install or run modified
-versions of the software inside them, although the manufacturer can do so.
-This is fundamentally incompatible with the aim of protecting users' freedom
-to change the software. The systematic pattern of such abuse occurs in the
-area of products for individuals to use, which is precisely where it is most
-unacceptable. Therefore, we have designed this version of the GPL to prohibit
-the practice for those products. If such problems arise substantially in other
-domains, we stand ready to extend this provision to those domains in future
-versions of the GPL, as needed to protect the freedom of users.
-
-Finally, every program is threatened constantly by software patents. States
-should not allow patents to restrict development and use of software on general-purpose
-computers, but in those that do, we wish to avoid the special danger that
-patents applied to a free program could make it effectively proprietary. To
-prevent this, the GPL assures that patents cannot be used to render the program
-non-free.
-
-The precise terms and conditions for copying, distribution and modification
-follow.
-
-TERMS AND CONDITIONS
-
-   0. Definitions.
-
-   "This License" refers to version 3 of the GNU General Public License.
-
-"Copyright" also means copyright-like laws that apply to other kinds of works,
-such as semiconductor masks.
-
-"The Program" refers to any copyrightable work licensed under this License.
-Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals
-or organizations.
-
-To "modify" a work means to copy from or adapt all or part of the work in
-a fashion requiring copyright permission, other than the making of an exact
-copy. The resulting work is called a "modified version" of the earlier work
-or a work "based on" the earlier work.
-
-A "covered work" means either the unmodified Program or a work based on the
-Program.
-
-To "propagate" a work means to do anything with it that, without permission,
-would make you directly or secondarily liable for infringement under applicable
-copyright law, except executing it on a computer or modifying a private copy.
-Propagation includes copying, distribution (with or without modification),
-making available to the public, and in some countries other activities as
-well.
-
-To "convey" a work means any kind of propagation that enables other parties
-to make or receive copies. Mere interaction with a user through a computer
-network, with no transfer of a copy, is not conveying.
-
-An interactive user interface displays "Appropriate Legal Notices" to the
-extent that it includes a convenient and prominently visible feature that
-(1) displays an appropriate copyright notice, and (2) tells the user that
-there is no warranty for the work (except to the extent that warranties are
-provided), that licensees may convey the work under this License, and how
-to view a copy of this License. If the interface presents a list of user commands
-or options, such as a menu, a prominent item in the list meets this criterion.
-
-   1. Source Code.
-
-The "source code" for a work means the preferred form of the work for making
-modifications to it. "Object code" means any non-source form of a work.
-
-A "Standard Interface" means an interface that either is an official standard
-defined by a recognized standards body, or, in the case of interfaces specified
-for a particular programming language, one that is widely used among developers
-working in that language.
-
-The "System Libraries" of an executable work include anything, other than
-the work as a whole, that (a) is included in the normal form of packaging
-a Major Component, but which is not part of that Major Component, and (b)
-serves only to enable use of the work with that Major Component, or to implement
-a Standard Interface for which an implementation is available to the public
-in source code form. A "Major Component", in this context, means a major essential
-component (kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to produce
-the work, or an object code interpreter used to run it.
-
-The "Corresponding Source" for a work in object code form means all the source
-code needed to generate, install, and (for an executable work) run the object
-code and to modify the work, including scripts to control those activities.
-However, it does not include the work's System Libraries, or general-purpose
-tools or generally available free programs which are used unmodified in performing
-those activities but which are not part of the work. For example, Corresponding
-Source includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically linked
-subprograms that the work is specifically designed to require, such as by
-intimate data communication or control flow between those subprograms and
-other parts of the work.
-
-The Corresponding Source need not include anything that users can regenerate
-automatically from other parts of the Corresponding Source.
-
-   The Corresponding Source for a work in source code form is that same work.
-
-   2. Basic Permissions.
-
-All rights granted under this License are granted for the term of copyright
-on the Program, and are irrevocable provided the stated conditions are met.
-This License explicitly affirms your unlimited permission to run the unmodified
-Program. The output from running a covered work is covered by this License
-only if the output, given its content, constitutes a covered work. This License
-acknowledges your rights of fair use or other equivalent, as provided by copyright
-law.
-
-You may make, run and propagate covered works that you do not convey, without
-conditions so long as your license otherwise remains in force. You may convey
-covered works to others for the sole purpose of having them make modifications
-exclusively for you, or provide you with facilities for running those works,
-provided that you comply with the terms of this License in conveying all material
-for which you do not control copyright. Those thus making or running the covered
-works for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of your copyrighted
-material outside their relationship with you.
-
-Conveying under any other circumstances is permitted solely under the conditions
-stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
-
-   3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-No covered work shall be deemed part of an effective technological measure
-under any applicable law fulfilling obligations under article 11 of the WIPO
-copyright treaty adopted on 20 December 1996, or similar laws prohibiting
-or restricting circumvention of such measures.
-
-When you convey a covered work, you waive any legal power to forbid circumvention
-of technological measures to the extent such circumvention is effected by
-exercising rights under this License with respect to the covered work, and
-you disclaim any intention to limit operation or modification of the work
-as a means of enforcing, against the work's users, your or third parties'
-legal rights to forbid circumvention of technological measures.
-
-   4. Conveying Verbatim Copies.
-
-You may convey verbatim copies of the Program's source code as you receive
-it, in any medium, provided that you conspicuously and appropriately publish
-on each copy an appropriate copyright notice; keep intact all notices stating
-that this License and any non-permissive terms added in accord with section
-7 apply to the code; keep intact all notices of the absence of any warranty;
-and give all recipients a copy of this License along with the Program.
-
-You may charge any price or no price for each copy that you convey, and you
-may offer support or warranty protection for a fee.
-
-   5. Conveying Modified Source Versions.
-
-You may convey a work based on the Program, or the modifications to produce
-it from the Program, in the form of source code under the terms of section
-4, provided that you also meet all of these conditions:
-
-a) The work must carry prominent notices stating that you modified it, and
-giving a relevant date.
-
-b) The work must carry prominent notices stating that it is released under
-this License and any conditions added under section 7. This requirement modifies
-the requirement in section 4 to "keep intact all notices".
-
-c) You must license the entire work, as a whole, under this License to anyone
-who comes into possession of a copy. This License will therefore apply, along
-with any applicable section 7 additional terms, to the whole of the work,
-and all its parts, regardless of how they are packaged. This License gives
-no permission to license the work in any other way, but it does not invalidate
-such permission if you have separately received it.
-
-d) If the work has interactive user interfaces, each must display Appropriate
-Legal Notices; however, if the Program has interactive interfaces that do
-not display Appropriate Legal Notices, your work need not make them do so.
-
-A compilation of a covered work with other separate and independent works,
-which are not by their nature extensions of the covered work, and which are
-not combined with it such as to form a larger program, in or on a volume of
-a storage or distribution medium, is called an "aggregate" if the compilation
-and its resulting copyright are not used to limit the access or legal rights
-of the compilation's users beyond what the individual works permit. Inclusion
-of a covered work in an aggregate does not cause this License to apply to
-the other parts of the aggregate.
-
-   6. Conveying Non-Source Forms.
-
-You may convey a covered work in object code form under the terms of sections
-4 and 5, provided that you also convey the machine-readable Corresponding
-Source under the terms of this License, in one of these ways:
-
-a) Convey the object code in, or embodied in, a physical product (including
-a physical distribution medium), accompanied by the Corresponding Source fixed
-on a durable physical medium customarily used for software interchange.
-
-b) Convey the object code in, or embodied in, a physical product (including
-a physical distribution medium), accompanied by a written offer, valid for
-at least three years and valid for as long as you offer spare parts or customer
-support for that product model, to give anyone who possesses the object code
-either (1) a copy of the Corresponding Source for all the software in the
-product that is covered by this License, on a durable physical medium customarily
-used for software interchange, for a price no more than your reasonable cost
-of physically performing this conveying of source, or (2) access to copy the
-Corresponding Source from a network server at no charge.
-
-c) Convey individual copies of the object code with a copy of the written
-offer to provide the Corresponding Source. This alternative is allowed only
-occasionally and noncommercially, and only if you received the object code
-with such an offer, in accord with subsection 6b.
-
-d) Convey the object code by offering access from a designated place (gratis
-or for a charge), and offer equivalent access to the Corresponding Source
-in the same way through the same place at no further charge. You need not
-require recipients to copy the Corresponding Source along with the object
-code. If the place to copy the object code is a network server, the Corresponding
-Source may be on a different server (operated by you or a third party) that
-supports equivalent copying facilities, provided you maintain clear directions
-next to the object code saying where to find the Corresponding Source. Regardless
-of what server hosts the Corresponding Source, you remain obligated to ensure
-that it is available for as long as needed to satisfy these requirements.
-
-e) Convey the object code using peer-to-peer transmission, provided you inform
-other peers where the object code and Corresponding Source of the work are
-being offered to the general public at no charge under subsection 6d.
-
-A separable portion of the object code, whose source code is excluded from
-the Corresponding Source as a System Library, need not be included in conveying
-the object code work.
-
-A "User Product" is either (1) a "consumer product", which means any tangible
-personal property which is normally used for personal, family, or household
-purposes, or (2) anything designed or sold for incorporation into a dwelling.
-In determining whether a product is a consumer product, doubtful cases shall
-be resolved in favor of coverage. For a particular product received by a particular
-user, "normally used" refers to a typical or common use of that class of product,
-regardless of the status of the particular user or of the way in which the
-particular user actually uses, or expects or is expected to use, the product.
-A product is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent the
-only significant mode of use of the product.
-
-"Installation Information" for a User Product means any methods, procedures,
-authorization keys, or other information required to install and execute modified
-versions of a covered work in that User Product from a modified version of
-its Corresponding Source. The information must suffice to ensure that the
-continued functioning of the modified object code is in no case prevented
-or interfered with solely because modification has been made.
-
-If you convey an object code work under this section in, or with, or specifically
-for use in, a User Product, and the conveying occurs as part of a transaction
-in which the right of possession and use of the User Product is transferred
-to the recipient in perpetuity or for a fixed term (regardless of how the
-transaction is characterized), the Corresponding Source conveyed under this
-section must be accompanied by the Installation Information. But this requirement
-does not apply if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has been installed
-in ROM).
-
-The requirement to provide Installation Information does not include a requirement
-to continue to provide support service, warranty, or updates for a work that
-has been modified or installed by the recipient, or for the User Product in
-which it has been modified or installed. Access to a network may be denied
-when the modification itself materially and adversely affects the operation
-of the network or violates the rules and protocols for communication across
-the network.
-
-Corresponding Source conveyed, and Installation Information provided, in accord
-with this section must be in a format that is publicly documented (and with
-an implementation available to the public in source code form), and must require
-no special password or key for unpacking, reading or copying.
-
-   7. Additional Terms.
-
-"Additional permissions" are terms that supplement the terms of this License
-by making exceptions from one or more of its conditions. Additional permissions
-that are applicable to the entire Program shall be treated as though they
-were included in this License, to the extent that they are valid under applicable
-law. If additional permissions apply only to part of the Program, that part
-may be used separately under those permissions, but the entire Program remains
-governed by this License without regard to the additional permissions.
-
-When you convey a copy of a covered work, you may at your option remove any
-additional permissions from that copy, or from any part of it. (Additional
-permissions may be written to require their own removal in certain cases when
-you modify the work.) You may place additional permissions on material, added
-by you to a covered work, for which you have or can give appropriate copyright
-permission.
-
-Notwithstanding any other provision of this License, for material you add
-to a covered work, you may (if authorized by the copyright holders of that
-material) supplement the terms of this License with terms:
-
-a) Disclaiming warranty or limiting liability differently from the terms of
-sections 15 and 16 of this License; or
-
-b) Requiring preservation of specified reasonable legal notices or author
-attributions in that material or in the Appropriate Legal Notices displayed
-by works containing it; or
-
-c) Prohibiting misrepresentation of the origin of that material, or requiring
-that modified versions of such material be marked in reasonable ways as different
-from the original version; or
-
-d) Limiting the use for publicity purposes of names of licensors or authors
-of the material; or
-
-e) Declining to grant rights under trademark law for use of some trade names,
-trademarks, or service marks; or
-
-f) Requiring indemnification of licensors and authors of that material by
-anyone who conveys the material (or modified versions of it) with contractual
-assumptions of liability to the recipient, for any liability that these contractual
-assumptions directly impose on those licensors and authors.
-
-All other non-permissive additional terms are considered "further restrictions"
-within the meaning of section 10. If the Program as you received it, or any
-part of it, contains a notice stating that it is governed by this License
-along with a term that is a further restriction, you may remove that term.
-If a license document contains a further restriction but permits relicensing
-or conveying under this License, you may add to a covered work material governed
-by the terms of that license document, provided that the further restriction
-does not survive such relicensing or conveying.
-
-If you add terms to a covered work in accord with this section, you must place,
-in the relevant source files, a statement of the additional terms that apply
-to those files, or a notice indicating where to find the applicable terms.
-
-Additional terms, permissive or non-permissive, may be stated in the form
-of a separately written license, or stated as exceptions; the above requirements
-apply either way.
-
-   8. Termination.
-
-You may not propagate or modify a covered work except as expressly provided
-under this License. Any attempt otherwise to propagate or modify it is void,
-and will automatically terminate your rights under this License (including
-any patent licenses granted under the third paragraph of section 11).
-
-However, if you cease all violation of this License, then your license from
-a particular copyright holder is reinstated (a) provisionally, unless and
-until the copyright holder explicitly and finally terminates your license,
-and (b) permanently, if the copyright holder fails to notify you of the violation
-by some reasonable means prior to 60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is reinstated permanently
-if the copyright holder notifies you of the violation by some reasonable means,
-this is the first time you have received notice of violation of this License
-(for any work) from that copyright holder, and you cure the violation prior
-to 30 days after your receipt of the notice.
-
-Termination of your rights under this section does not terminate the licenses
-of parties who have received copies or rights from you under this License.
-If your rights have been terminated and not permanently reinstated, you do
-not qualify to receive new licenses for the same material under section 10.
-
-   9. Acceptance Not Required for Having Copies.
-
-You are not required to accept this License in order to receive or run a copy
-of the Program. Ancillary propagation of a covered work occurring solely as
-a consequence of using peer-to-peer transmission to receive a copy likewise
-does not require acceptance. However, nothing other than this License grants
-you permission to propagate or modify any covered work. These actions infringe
-copyright if you do not accept this License. Therefore, by modifying or propagating
-a covered work, you indicate your acceptance of this License to do so.
-
-   10. Automatic Licensing of Downstream Recipients.
-
-Each time you convey a covered work, the recipient automatically receives
-a license from the original licensors, to run, modify and propagate that work,
-subject to this License. You are not responsible for enforcing compliance
-by third parties with this License.
-
-An "entity transaction" is a transaction transferring control of an organization,
-or substantially all assets of one, or subdividing an organization, or merging
-organizations. If propagation of a covered work results from an entity transaction,
-each party to that transaction who receives a copy of the work also receives
-whatever licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the Corresponding
-Source of the work from the predecessor in interest, if the predecessor has
-it or can get it with reasonable efforts.
-
-You may not impose any further restrictions on the exercise of the rights
-granted or affirmed under this License. For example, you may not impose a
-license fee, royalty, or other charge for exercise of rights granted under
-this License, and you may not initiate litigation (including a cross-claim
-or counterclaim in a lawsuit) alleging that any patent claim is infringed
-by making, using, selling, offering for sale, or importing the Program or
-any portion of it.
-
-   11. Patents.
-
-A "contributor" is a copyright holder who authorizes use under this License
-of the Program or a work on which the Program is based. The work thus licensed
-is called the contributor's "contributor version".
-
-A contributor's "essential patent claims" are all patent claims owned or controlled
-by the contributor, whether already acquired or hereafter acquired, that would
-be infringed by some manner, permitted by this License, of making, using,
-or selling its contributor version, but do not include claims that would be
-infringed only as a consequence of further modification of the contributor
-version. For purposes of this definition, "control" includes the right to
-grant patent sublicenses in a manner consistent with the requirements of this
-License.
-
-Each contributor grants you a non-exclusive, worldwide, royalty-free patent
-license under the contributor's essential patent claims, to make, use, sell,
-offer for sale, import and otherwise run, modify and propagate the contents
-of its contributor version.
-
-In the following three paragraphs, a "patent license" is any express agreement
-or commitment, however denominated, not to enforce a patent (such as an express
-permission to practice a patent or covenant not to sue for patent infringement).
-To "grant" such a patent license to a party means to make such an agreement
-or commitment not to enforce a patent against the party.
-
-If you convey a covered work, knowingly relying on a patent license, and the
-Corresponding Source of the work is not available for anyone to copy, free
-of charge and under the terms of this License, through a publicly available
-network server or other readily accessible means, then you must either (1)
-cause the Corresponding Source to be so available, or (2) arrange to deprive
-yourself of the benefit of the patent license for this particular work, or
-(3) arrange, in a manner consistent with the requirements of this License,
-to extend the patent license to downstream recipients. "Knowingly relying"
-means you have actual knowledge that, but for the patent license, your conveying
-the covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that country
-that you have reason to believe are valid.
-
-If, pursuant to or in connection with a single transaction or arrangement,
-you convey, or propagate by procuring conveyance of, a covered work, and grant
-a patent license to some of the parties receiving the covered work authorizing
-them to use, propagate, modify or convey a specific copy of the covered work,
-then the patent license you grant is automatically extended to all recipients
-of the covered work and works based on it.
-
-A patent license is "discriminatory" if it does not include within the scope
-of its coverage, prohibits the exercise of, or is conditioned on the non-exercise
-of one or more of the rights that are specifically granted under this License.
-You may not convey a covered work if you are a party to an arrangement with
-a third party that is in the business of distributing software, under which
-you make payment to the third party based on the extent of your activity of
-conveying the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory patent
-license (a) in connection with copies of the covered work conveyed by you
-(or copies made from those copies), or (b) primarily for and in connection
-with specific products or compilations that contain the covered work, unless
-you entered into that arrangement, or that patent license was granted, prior
-to 28 March 2007.
-
-Nothing in this License shall be construed as excluding or limiting any implied
-license or other defenses to infringement that may otherwise be available
-to you under applicable patent law.
-
-   12. No Surrender of Others' Freedom.
-
-If conditions are imposed on you (whether by court order, agreement or otherwise)
-that contradict the conditions of this License, they do not excuse you from
-the conditions of this License. If you cannot convey a covered work so as
-to satisfy simultaneously your obligations under this License and any other
-pertinent obligations, then as a consequence you may not convey it at all.
-For example, if you agree to terms that obligate you to collect a royalty
-for further conveying from those to whom you convey the Program, the only
-way you could satisfy both those terms and this License would be to refrain
-entirely from conveying the Program.
-
-   13. Use with the GNU Affero General Public License.
-
-Notwithstanding any other provision of this License, you have permission to
-link or combine any covered work with a work licensed under version 3 of the
-GNU Affero General Public License into a single combined work, and to convey
-the resulting work. The terms of this License will continue to apply to the
-part which is the covered work, but the special requirements of the GNU Affero
-General Public License, section 13, concerning interaction through a network
-will apply to the combination as such.
-
-   14. Revised Versions of this License.
-
-The Free Software Foundation may publish revised and/or new versions of the
-GNU General Public License from time to time. Such new versions will be similar
-in spirit to the present version, but may differ in detail to address new
-problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies
-that a certain numbered version of the GNU General Public License "or any
-later version" applies to it, you have the option of following the terms and
-conditions either of that numbered version or of any later version published
-by the Free Software Foundation. If the Program does not specify a version
-number of the GNU General Public License, you may choose any version ever
-published by the Free Software Foundation.
-
-If the Program specifies that a proxy can decide which future versions of
-the GNU General Public License can be used, that proxy's public statement
-of acceptance of a version permanently authorizes you to choose that version
-for the Program.
-
-Later license versions may give you additional or different permissions. However,
-no additional obligations are imposed on any author or copyright holder as
-a result of your choosing to follow a later version.
-
-   15. Disclaimer of Warranty.
-
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE
-LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
-EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM
-PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
-CORRECTION.
-
-   16. Limitation of Liability.
-
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
-ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM
-AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO
-USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
-INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
-PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
-PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-   17. Interpretation of Sections 15 and 16.
-
-If the disclaimer of warranty and limitation of liability provided above cannot
-be given local legal effect according to their terms, reviewing courts shall
-apply local law that most closely approximates an absolute waiver of all civil
-liability in connection with the Program, unless a warranty or assumption
-of liability accompanies a copy of the Program in return for a fee. END OF
-TERMS AND CONDITIONS
-
-How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the greatest possible
-use to the public, the best way to achieve this is to make it free software
-which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program. It is safest to attach
-them to the start of each source file to most effectively state the exclusion
-of warranty; and each file should have at least the "copyright" line and a
-pointer to where the full notice is found.
-
-<one line to give the program's name and a brief idea of what it does.>
-
-Copyright (C) <year> <name of author>
-
-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 <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program does terminal interaction, make it output a short notice like
-this when it starts in an interactive mode:
-
-<program> Copyright (C) <year> <name of author>
-
-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 <https://www.gnu.org/licenses/>.
-
-The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General Public
-License instead of this License. But first, please read <https://www.gnu.org/
-licenses /why-not-lgpl.html>.
--- a/4
+++ b/4
@ -3,6 +3,8 @@
 # project subdirectory.
 #

-PROJECT_NAME := mesh_ota
+PROJECT_NAME := https-mbedtls
+
+EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common

 include $(IDF_PATH)/make/project.mk
--- a/README.md
+++ b/README.md
@ -1,4 +0,0 @@
-# ESP32-Mesh-OTA
-
-
-
--- a/components/mesh_ota/CMakeLists.txt
+++ b/components/mesh_ota/CMakeLists.txt
@ -1,7 +0,0 @@
-idf_component_register(SRCS "Mesh_OTA_Util.c" "Mesh_Network.c" "Mesh_Network_Handler.c" "HTTPS_Client.c" "Mesh_OTA_Partition_Access.c" "Mesh_OTA_Globals.c" "Mesh_OTA.c"
-                    INCLUDE_DIRS "include" 
-                    REQUIRES nvs_flash
-                    esp_http_client
-                    bootloader_support
-                    app_update
-                    log)
--- a/components/mesh_ota/HTTPS_Client.c
+++ b/components/mesh_ota/HTTPS_Client.c
@ -1,355 +0,0 @@
-/**
-* @file HTTPS_Client.c
-* @brief Used to download the OTA image from the server
-* @author Hendrik Schutter
-* @date 20.01.2021
-*
-* Additional Infos: Connects via HTTPS and HTTPS Basic Auth to the Server.
-* Downloads the image in segments
-*/
-
-#include "HTTPS_Client.h"
-
-static const char *TAG = "https_client";
-
-//HTTP GET data
-static const char *REQUEST = "GET " CONFIG_OTA_HTTPS_URL " HTTP/1.1\r\n"
-                             "Host: "CONFIG_OTA_HTTPS_SERVER_COMMON_NAME"\r\n"
-                             "User-Agent: esp-idf/1.0 esp32\r\n"
-                             "Authorization: Basic " CONFIG_OTA_HTTPS_AUTH "\r\n"
-                             "\r\n";
-
-
-static HTTPS_Client_t sHTTPS_ClientConfig;
-
-https_client_ret_t https_clientInitEmbedTLS(void);
-https_client_ret_t errHTTPSClientConnectToServer(void);
-https_client_ret_t errHTTPSClientValidateServer(void);
-https_client_ret_t errHTTPSClientSendRequest(void);
-
-/**
-* @fn https_client_ret_t errHTTPSClientInitialize(void)
-* @brief Initialize the client
-* @param void
-* @return HTTPS_Client error code
-* @author Hendrik Schutter
-* @date 20.01.2021
-*
-* Initialize embedTLS
-*/
-https_client_ret_t errHTTPSClientInitialize(void)
-{
-    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
-
-    i32RetHTTPClient = https_clientInitEmbedTLS();
-
-    if (i32RetHTTPClient == HTTPS_CLIENT_ERROR_INIT_EMBEDTLS)
-        {
-            ESP_LOGE(TAG, "Unable to initialize EmbedTLS");
-            i32RetHTTPClient = HTTPS_CLIENT_ERROR;
-        }
-    return i32RetHTTPClient;
-}
-
-/**
-* @fn https_client_ret_t errHTTPSClientRetrieveData(char* const cpu8Data, const uint32_t* const cpcu32DataLenght, uint32_t* pu32BytesRead)
-* @brief receive a image segment from server
-* @param cpu8Data data buffer
-* @param cpcu32DataLenght desired byte amount
-* @param pu32BytesRead actual received byte amount
-* @return HTTPS_Client error code
-* @author Hendrik Schutter
-* @date 20.01.2021
-*
-* Read segement and handle all events like EOF or timeout
-*/
-https_client_ret_t errHTTPSClientRetrieveData(char* const cpu8Data, const uint32_t* const cpcu32DataLenght, uint32_t* pu32BytesRead)
-{
-    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
-    int32_t i32RetRetrieveData = ESP_OK;
-    bool bRetriveData = true;
-
-    bzero(cpu8Data, *cpcu32DataLenght);
-    (*pu32BytesRead) = 0U;
-
-    while (bRetriveData)
-        {
-            mbedtls_ssl_conf_read_timeout(&sHTTPS_ClientConfig.conf, HTTPS_READ_TIMEOUT); //set timeout
-            //Reading HTTP response
-            i32RetRetrieveData = mbedtls_ssl_read(&sHTTPS_ClientConfig.ssl, (unsigned char *)(cpu8Data+(*pu32BytesRead)), ((*cpcu32DataLenght)-(*pu32BytesRead)));
-
-            if(i32RetRetrieveData > 0)
-                {
-                    //Data received
-                    *pu32BytesRead = *pu32BytesRead + i32RetRetrieveData;
-
-                    if(*cpcu32DataLenght > 0)
-                        {
-                            //buffer not full yet --> read some more
-                            bRetriveData = true;
-                        }
-                    else
-                        {
-                            //buffer full --> stop reading
-                            bRetriveData = false;
-                        }
-                }
-
-            if(i32RetRetrieveData == 0)
-                {
-                    //all data read --> stop reading
-                    bRetriveData = false;
-                    pu32BytesRead = 0;
-                }
-
-            if(i32RetRetrieveData == MBEDTLS_ERR_SSL_TIMEOUT )
-                {
-                    //timeout --> stop reading
-                    bRetriveData = false;
-                }
-
-            if(i32RetRetrieveData == MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY)
-                {
-                    //connection is going to be closed
-                    i32RetHTTPClient = HTTPS_CLIENT_ERROR;
-                    bRetriveData = false;
-                }
-        }
-    return i32RetHTTPClient;
-}
-
-/**
-* @fn https_client_ret_t errHTTPSClientReset(void)
-* @brief reset client for next receive of image
-* @param void
-* @return HTTPS_Client error code
-* @author Hendrik Schutter
-* @date 20.01.2021
-*
-* reset session
-*/
-https_client_ret_t errHTTPSClientReset(void)
-{
-    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
-
-    i32RetHTTPClient = mbedtls_ssl_close_notify(&sHTTPS_ClientConfig.ssl); //close session
-
-    if(i32RetHTTPClient != ESP_OK)
-        {
-            ESP_LOGE(TAG, "mbedtls_ssl_close_notify returned 0x%x", i32RetHTTPClient);
-        }
-
-    mbedtls_ssl_session_reset(&sHTTPS_ClientConfig.ssl); //reset embedssl
-    mbedtls_net_free(&sHTTPS_ClientConfig.server_fd); //free ram
-
-    return i32RetHTTPClient;
-}
-
-/**
-* @fn https_client_ret_t https_clientInitEmbedTLS(void)
-* @brief init embedTLS
-* @param void
-* @return HTTPS_Client error code
-* @author Hendrik Schutter
-* @date 20.01.2021
-*
-* attach certs for tls
-*/
-https_client_ret_t https_clientInitEmbedTLS(void)
-{
-    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
-    int32_t i32RetEmbedTLS = ESP_OK;
-    static bool bAlreadySetup = false;
-
-    mbedtls_ssl_init(&sHTTPS_ClientConfig.ssl);
-    mbedtls_x509_crt_init(&sHTTPS_ClientConfig.cacert);
-    mbedtls_ctr_drbg_init(&sHTTPS_ClientConfig.ctr_drbg);
-    mbedtls_ssl_config_init(&sHTTPS_ClientConfig.conf);
-    mbedtls_entropy_init(&sHTTPS_ClientConfig.entropy);
-
-    i32RetEmbedTLS = mbedtls_ctr_drbg_seed(&sHTTPS_ClientConfig.ctr_drbg, mbedtls_entropy_func, &sHTTPS_ClientConfig.entropy, NULL, 0);
-
-    if(i32RetEmbedTLS!= ESP_OK)
-        {
-            ESP_LOGE(TAG, "mbedtls_ctr_drbg_seed returned %d", i32RetEmbedTLS);
-        }
-
-    if(i32RetEmbedTLS == ESP_OK)
-        {
-            //Attaching the certificate bundle
-            i32RetEmbedTLS = esp_crt_bundle_attach(&sHTTPS_ClientConfig.conf);
-            if(i32RetEmbedTLS != ESP_OK)
-                {
-                    ESP_LOGE(TAG, "esp_crt_bundle_attach returned 0x%x\n\n", i32RetEmbedTLS);
-                }
-        }
-
-    if(i32RetEmbedTLS == ESP_OK)
-        {
-            //Setting hostname for TLS session.
-            i32RetEmbedTLS = mbedtls_ssl_set_hostname(&sHTTPS_ClientConfig.ssl, CONFIG_OTA_HTTPS_SERVER_COMMON_NAME);
-            // Hostname set here should match CN in server certificate
-            if(i32RetEmbedTLS != ESP_OK)
-                {
-                    ESP_LOGE(TAG, "mbedtls_ssl_set_hostname returned 0x%x", i32RetEmbedTLS);
-                }
-        }
-    if(i32RetEmbedTLS == ESP_OK)
-        {
-            //Setting up the SSL/TLS structure
-            i32RetEmbedTLS = mbedtls_ssl_config_defaults(&sHTTPS_ClientConfig.conf,
-                             MBEDTLS_SSL_IS_CLIENT,
-                             MBEDTLS_SSL_TRANSPORT_STREAM,
-                             MBEDTLS_SSL_PRESET_DEFAULT);
-
-            if(i32RetEmbedTLS != ESP_OK)
-                {
-                    ESP_LOGE(TAG, "mbedtls_ssl_config_defaults returned %d", i32RetEmbedTLS);
-                }
-        }
-
-    if(i32RetEmbedTLS == ESP_OK)
-        {
-            mbedtls_ssl_conf_authmode(&sHTTPS_ClientConfig.conf, MBEDTLS_SSL_VERIFY_REQUIRED);
-            mbedtls_ssl_conf_ca_chain(&sHTTPS_ClientConfig.conf, &sHTTPS_ClientConfig.cacert, NULL);
-            mbedtls_ssl_conf_rng(&sHTTPS_ClientConfig.conf, mbedtls_ctr_drbg_random, &sHTTPS_ClientConfig.ctr_drbg);
-
-            if (bAlreadySetup == false) //check if mbedtls_ssl_setup was called before
-                {
-                    i32RetEmbedTLS = mbedtls_ssl_setup(&sHTTPS_ClientConfig.ssl, &sHTTPS_ClientConfig.conf); //call this only once
-                    if(i32RetEmbedTLS != ESP_OK)
-                        {
-                            ESP_LOGE(TAG, "mbedtls_ssl_setup returned 0x%x\n", i32RetEmbedTLS);
-                        }
-                    else
-                        {
-                            bAlreadySetup = true;
-                        }
-                }
-        }
-
-    if(i32RetEmbedTLS == ESP_OK)
-        {
-            mbedtls_net_init(&sHTTPS_ClientConfig.server_fd);
-        }
-
-    if (i32RetEmbedTLS != ESP_OK)
-        {
-            i32RetHTTPClient = HTTPS_CLIENT_ERROR_INIT_EMBEDTLS;
-        }
-
-    return i32RetHTTPClient;
-}
-
-/**
-* @fn https_client_ret_t errHTTPSClientConnectToServer(void)
-* @brief connect to server
-* @param void
-* @return HTTPS_Client error code
-* @author Hendrik Schutter
-* @date 20.01.2021
-*
-* open TLS session
-*/
-https_client_ret_t errHTTPSClientConnectToServer(void)
-{
-    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
-    int32_t i32RetServerConnect = ESP_OK;
-
-    //Connecting to server
-    i32RetServerConnect = mbedtls_net_connect(&sHTTPS_ClientConfig.server_fd, CONFIG_OTA_HTTPS_SERVER_COMMON_NAME, CONFIG_OTA_HTTPS_SERVER_PORT, MBEDTLS_NET_PROTO_TCP);
-    if (i32RetServerConnect != ESP_OK)
-        {
-            ESP_LOGE(TAG, "mbedtls_net_connect returned %x", i32RetServerConnect);
-        }
-
-    if(i32RetServerConnect == ESP_OK)
-        {
-            mbedtls_ssl_set_bio(&sHTTPS_ClientConfig.ssl, &sHTTPS_ClientConfig.server_fd, mbedtls_net_send, mbedtls_net_recv, mbedtls_net_recv_timeout);
-
-            //Performing the SSL/TLS handshake
-            while ((i32RetServerConnect = mbedtls_ssl_handshake(&sHTTPS_ClientConfig.ssl)) != 0)
-                {
-                    if ((i32RetServerConnect != MBEDTLS_ERR_SSL_WANT_READ) && (i32RetServerConnect != MBEDTLS_ERR_SSL_WANT_WRITE))
-                        {
-                            ESP_LOGE(TAG, "mbedtls_ssl_handshake returned 0x%x", i32RetServerConnect);
-                        }
-                }
-        }
-
-    if(i32RetServerConnect != ESP_OK)
-        {
-            i32RetHTTPClient = HTTPS_CLIENT_ERROR_INIT_CONNECT_TWO_SERVER;
-        }
-    return i32RetHTTPClient;
-}
-
-/**
-* @fn https_client_ret_t errHTTPSClientValidateServer(void)
-* @brief validate server
-* @param void
-* @return HTTPS_Client error code
-* @author Hendrik Schutter
-* @date 20.01.2021
-*
-* check CDN and cert
-*/
-https_client_ret_t errHTTPSClientValidateServer(void)
-{
-    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
-    int32_t i32RetValidateServer = ESP_OK;
-
-    //Verifying peer X.509 certificate
-    if ((i32RetValidateServer = mbedtls_ssl_get_verify_result(&sHTTPS_ClientConfig.ssl)) != 0)
-        {
-            ESP_LOGE(TAG, "Failed to verify peer certificate!");
-        }
-
-    if(i32RetValidateServer != ESP_OK)
-        {
-            i32RetHTTPClient = HTTPS_CLIENT_ERROR_INIT_VALIDATE_SERVER;
-        }
-    return i32RetHTTPClient;
-}
-
-/**
-* @fn https_client_ret_t errHTTPSClientSendRequest(void)
-* @brief send request to server
-* @param void
-* @return HTTPS_Client error code
-* @author Hendrik Schutter
-* @date 20.01.2021
-*
-* send HTTP GET request
-*/
-https_client_ret_t errHTTPSClientSendRequest(void)
-{
-    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
-    int32_t i32RetSendRequest = ESP_OK;
-    uint32_t u32WrittenBytes = 0;
-    bool bWrite = true; //flag to stop loop
-
-    //Writing HTTP request
-    while((u32WrittenBytes < strlen(REQUEST)) && bWrite)
-        {
-            i32RetSendRequest = mbedtls_ssl_write(&sHTTPS_ClientConfig.ssl,
-                                                  (const unsigned char *)REQUEST + u32WrittenBytes,
-                                                  strlen(REQUEST) - u32WrittenBytes);
-            if (i32RetSendRequest >= 0)
-                {
-                    //bytes written
-                    u32WrittenBytes += i32RetSendRequest;
-                }
-            else if (i32RetSendRequest != MBEDTLS_ERR_SSL_WANT_WRITE && i32RetSendRequest != MBEDTLS_ERR_SSL_WANT_READ)
-                {
-                    ESP_LOGE(TAG, "mbedtls_ssl_write returned 0x%x", i32RetSendRequest);
-                    bWrite = false;
-                }
-        }
-
-    if(bWrite == false)
-        {
-            i32RetHTTPClient = HTTPS_CLIENT_ERROR_INIT_SEND_REQUEST;
-        }
-    return i32RetHTTPClient;
-}
--- a/components/mesh_ota/Mesh_Network.c
+++ b/components/mesh_ota/Mesh_Network.c
@ -1,485 +0,0 @@
-/**
-* @file Mesh_Network.c
-* @brief Mesh network layer used by OTA and APP
-* @author Hendrik Schutter, init based in ESP32-IDE code
-* @date 20.01.2021
-*
-* Additional Infos: Start network and send and receive data.
-*/
-
-#include "Mesh_Network.h"
-
-static const char *LOG_TAG = "mesh_network";
-
-//w: errMeshNetworkInitialize
-//r: errMeshNetworkInitialize;vMeshNetworkGetOwnAddr;errMeshNetworkGetChildren
-uint8_t u8ownMAC[6];
-
-//w: errMeshNetworkInitialize; vMeshNetworkMeshEventHandler
-//r: vMeshNetworkMeshEventHandler
-esp_netif_t* pNetifSta;
-
-//w: errMeshNetworkInitialize; vMeshNetworkMeshEventHandler
-//r: errMeshNetworkInitialize;
-bool bIsMeshConnected;
-
-//w: errMeshNetworkInitialize; vMeshNetworkMeshEventHandler
-//r: vMeshNetworkMeshEventHandler
-int32_t i32MeshLayer;
-
-//w: errMeshNetworkInitialize; vMeshNetworkMeshEventHandler
-//r: vMeshNetworkMeshEventHandler
-mesh_addr_t meshParentAddr;
-
-//function pointer for callbacks
-void (*pAppRxHandle)(const uint8_t* const, const uint8_t* const);
-void (*pOTAChildConnectHandle)(const uint8_t* const);
-void (*pOTAMessageHandle)(const MESH_PACKET_t* const);
-void (*pChangeStateOfServerWorkerHandle)(const bool );
-
-/**
-* @fn esp_err_t errMeshNetworkInitialize()
-* @brief Starts the mesh network
-* @param void
-* @return ESP32 error code
-* @author Hendrik Schutter, init based in ESP32-IDE code
-* @date 20.01.2021
-*
-* Initialize the network
-*/
-esp_err_t errMeshNetworkInitialize(void)
-{
-    //init module variables
-    esp_err_t err;
-    bIsMeshConnected = false;
-    i32MeshLayer = -1;
-    pNetifSta = NULL;
-
-    err = nvs_flash_init(); //init non-volatile storage
-
-#ifdef ERASE_NVS
-    if(err == ESP_ERR_NVS_NO_FREE_PAGES) //check if storage is full
-        {
-            ERROR_CHECK(nvs_flash_erase());
-        }
-#endif
-
-    // tcpip initialization
-    ERROR_CHECK(esp_netif_init());
-
-    //event initialization
-    ERROR_CHECK(esp_event_loop_create_default());
-
-    //create network interfaces for mesh (only station instance saved for further manipulation, soft AP instance ignored
-    ERROR_CHECK(esp_netif_create_default_wifi_mesh_netifs(&pNetifSta, NULL));
-
-    //wifi initialization
-    ERROR_CHECK(errMeshNetworkInitializeWiFi());
-
-    //mesh initialization
-    ERROR_CHECK(esp_mesh_init());
-
-    //mesh initialization
-    ERROR_CHECK(esp_event_handler_register(MESH_EVENT, ESP_EVENT_ANY_ID, &vMeshNetworkMeshEventHandler, NULL));
-
-    //set mesh topology
-    ERROR_CHECK(esp_mesh_set_topology(CONFIG_MESH_TOPOLOGY));
-
-    //set mesh max layer according to the topology
-    ERROR_CHECK(esp_mesh_set_max_layer(CONFIG_MESH_MAX_LAYER));
-    ERROR_CHECK(esp_mesh_set_vote_percentage(1));
-    ERROR_CHECK(esp_mesh_set_xon_qsize(128));
-
-    //Disable mesh PS function
-    ERROR_CHECK(esp_mesh_disable_ps());
-    ERROR_CHECK(esp_mesh_set_ap_assoc_expire(10));
-
-    mesh_cfg_t cfg = MESH_INIT_CONFIG_DEFAULT();
-
-    /* mesh ID */
-    memcpy((uint8_t *) &cfg.mesh_id, CONFIG_MESH_ID, 6);
-
-    ERROR_CHECK(errMeshNetworkInitializeRouter(&cfg));
-
-    /* mesh softAP */
-    ERROR_CHECK(esp_mesh_set_ap_authmode(CONFIG_MESH_AP_AUTHMODE));
-    cfg.mesh_ap.max_connection = CONFIG_MESH_AP_CONNECTIONS;
-    memcpy((uint8_t *) &cfg.mesh_ap.password, CONFIG_MESH_AP_PASSWD,
-           strlen(CONFIG_MESH_AP_PASSWD));
-    ERROR_CHECK(esp_mesh_set_config(&cfg));
-
-    /* mesh start */
-    ERROR_CHECK(esp_mesh_start());
-
-    ERROR_CHECK(esp_base_mac_addr_get(u8ownMAC))
-
-    //debug info
-    ESP_LOGD(LOG_TAG, "mesh starts successfully, heap:%d, %s<%d>%s, ps:%d\n",  esp_get_minimum_free_heap_size(),
-             esp_mesh_is_root_fixed() ? "root fixed" : "root not fixed",
-             esp_mesh_get_topology(), esp_mesh_get_topology() ? "(chain)":"(tree)", esp_mesh_is_ps_enabled());
-
-
-    ESP_LOGI(LOG_TAG, "Node MAC: \"%x:%x:%x:%x:%x:%x\" ", u8ownMAC[0], u8ownMAC[1], u8ownMAC[2], u8ownMAC[3], u8ownMAC[4], u8ownMAC[5]);
-
-    return ESP_OK;
-}
-
-/**
-* @fn esp_err_t errMeshNetworkInitializeWiFi()
-* @brief Starts the WiFI
-* @param void
-* @return ESP32 error code
-* @author Hendrik Schutter, init based in ESP32-IDE code
-* @date 20.01.2021
-*
-* start the wifi
-*/
-esp_err_t errMeshNetworkInitializeWiFi()
-{
-//wifi initialization
-    esp_err_t err = ESP_OK;
-    wifi_init_config_t config = WIFI_INIT_CONFIG_DEFAULT();
-    ERROR_CHECK(esp_wifi_init(&config));
-    ERROR_CHECK(esp_event_handler_register(IP_EVENT, IP_EVENT_STA_GOT_IP, &vMeshNetworkIpEventHandler, NULL));
-    ERROR_CHECK(esp_wifi_set_storage(WIFI_STORAGE_FLASH));
-    ERROR_CHECK(esp_wifi_start());
-    return err;
-}
-
-/**
-* @fn esp_err_t errMeshNetworkInitializeRouter(mesh_cfg_t* cfg)
-* @brief Starts the router
-* @param cfg router config
-* @return ESP32 error code
-* @author Hendrik Schutter, init based in ESP32-IDE code
-* @date 20.01.2021
-*
-* Initialize the network
-*/
-esp_err_t errMeshNetworkInitializeRouter(mesh_cfg_t* cfg)
-{
-//router initialization
-    esp_err_t err = ESP_OK;
-    (*cfg).channel = CONFIG_MESH_CHANNEL;
-    (*cfg).router.ssid_len = strlen(CONFIG_MESH_ROUTER_SSID);
-    memcpy((uint8_t *) &(*cfg).router.ssid, CONFIG_MESH_ROUTER_SSID, (*cfg).router.ssid_len);
-    memcpy((uint8_t *) &(*cfg).router.password, CONFIG_MESH_ROUTER_PASSWD,
-           strlen(CONFIG_MESH_ROUTER_PASSWD));
-    return err;
-}
-
-/**
-* @fn esp_err_t errMeshNetworkSetChildConnectedHandle(void (*pChildConnectHandleTmp)(const uint8_t* const cpcu8Data))
-* @brief set callback for event when child connects
-* @param (*pChildConnectHandleTmp)(const uint8_t* const cpcu8Data) function pointer
-* @return ESP32 error code
-* @author Hendrik Schutter
-* @date 20.01.2021
-*/
-esp_err_t errMeshNetworkSetChildConnectedHandle(void (*pChildConnectHandleTmp)(const uint8_t* const cpcu8Data))
-{
-    pOTAChildConnectHandle = pChildConnectHandleTmp;
-    return ESP_OK;
-}
-
-/**
-* @fn esp_err_t errMeshNetworkSetAppReceiveHandle(void (*pAppRxHandleTmp)(const uint8_t* const cpcu8Data, const uint8_t* const pu8Sender))
-* @brief set callback for event when application data is received
-* @param (*pAppRxHandleTmp)(const uint8_t* const cpcu8Data, const uint8_t* const pu8Sender) function pointer
-* @return ESP32 error code
-* @author Hendrik Schutter
-* @date 20.01.2021
-*/
-esp_err_t errMeshNetworkSetAppReceiveHandle(void (*pAppRxHandleTmp)(const uint8_t* const cpcu8Data, const uint8_t* const pu8Sender))
-{
-    pAppRxHandle = pAppRxHandleTmp; //set handle from app as receive handle if an app packet is received
-    return ESP_OK;
-}
-
-/**
-* @fn esp_err_t errMeshNetworkSetOTAMessageHandleHandle(void (*pOTAMessageHandleTmp)(const MESH_PACKET_t* const cpcuMeshPacket))
-* @brief set callback for event when OTA message is received
-* @param (*pOTAMessageHandleTmp)(const MESH_PACKET_t* const cpcuMeshPacket) function pointer
-* @return ESP32 error code
-* @author Hendrik Schutter
-* @date 20.01.2021
-*/
-esp_err_t errMeshNetworkSetOTAMessageHandleHandle(void (*pOTAMessageHandleTmp)(const MESH_PACKET_t* const cpcuMeshPacket))
-{
-    pOTAMessageHandle = pOTAMessageHandleTmp;
-    return ESP_OK;
-}
-
-/**
-* @fn esp_err_t errMeshNetworkSetChangeStateOfServerWorkerHandle(void (*pChangeStateOfServerWorkerHandleTmp)(const bool cbState))
-* @brief set callback for event when connectify to server is changed
-* @param (*pChangeStateOfServerWorkerHandleTmp)(const bool cbState) function pointer
-* @return ESP32 error code
-* @author Hendrik Schutter
-* @date 20.01.2021
-*/
-esp_err_t errMeshNetworkSetChangeStateOfServerWorkerHandle(void (*pChangeStateOfServerWorkerHandleTmp)(const bool cbState))
-{
-    pChangeStateOfServerWorkerHandle = pChangeStateOfServerWorkerHandleTmp;
-    return ESP_OK;
-}
-
-/**
-* @fn esp_err_t errMeshNetworkSendMeshPacket(const mesh_addr_t* const cpcAddrDest, const MESH_PACKET_t* const cpcPacket)
-* @brief send packet to mesh node
-* @param cpcAddrDest address from mesh node
-* @param cpcPacket packet to send
-* @return ESP32 error code
-* @author Hendrik Schutter
-* @date 20.01.2021
-*/
-esp_err_t errMeshNetworkSendMeshPacket(const mesh_addr_t* const cpcAddrDest, const MESH_PACKET_t* const cpcPacket)
-{
-    esp_err_t err;
-    mesh_data_t data;
-    uint8_t tx_buf[CONFIG_MESH_MESSAGE_SIZE] = { 0, };
-    data.data = tx_buf;
-    data.size = sizeof(tx_buf);
-    data.proto = MESH_PROTO_BIN;
-    data.tos = MESH_TOS_P2P;
-    memcpy(tx_buf, (uint8_t *)cpcPacket, sizeof(MESH_PACKET_t));
-
-    err = esp_mesh_send(cpcAddrDest, &data, MESH_DATA_P2P, NULL, 0);
-
-    return err;
-}
-
-/**
-* @fn bool bMeshNetworkIsRootNode()
-* @brief return  true if this node is the root
-* @param void
-* @return boolean
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-bool bMeshNetworkIsRootNode(void)
-{
-    return esp_mesh_is_root();
-}
-
-/**
-* @fn bool bMeshNetworkIsNodeNeighbour(const mesh_addr_t* const cpcNode)
-* @brief return true if node is neighbour if this
-* @param cpcNode to check
-* @return boolean
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-bool bMeshNetworkIsNodeNeighbour(const mesh_addr_t* const cpcNode)
-{
-    esp_err_t err = ESP_OK;
-    bool bReturn = false;
-    mesh_addr_t addrParent;  //addr of parent node
-    mesh_addr_t childrenAddr[CONFIG_MESH_ROUTE_TABLE_SIZE]; //array of children attached to this node
-    uint16_t u16ChildrenSize = 0U; //number of children attached to this node
-
-    err = errMeshNetworkGetParentNode(&addrParent);
-
-    if(err == ESP_OK)
-        {
-            if(bMeshNetworkCheckMacEquality(cpcNode->addr,  addrParent.addr) == true)
-                {
-                    bReturn = true; //node was found
-                }
-        }
-
-    if(bReturn == false)
-        {
-            err = ESP_OK; //reset error code
-
-            ERROR_CHECK(errMeshNetworkGetChildren(childrenAddr, &u16ChildrenSize)); //get all children
-
-            for (uint16_t u16Index = 0; ((u16Index < u16ChildrenSize) && (err == ESP_OK) && (bReturn == false)); u16Index++)
-                {
-                    if(bMeshNetworkCheckMacEquality(cpcNode->addr,  childrenAddr[u16Index].addr) == true)
-                        {
-                            bReturn = true; //node was found
-                        }
-                }
-        }
-    return bReturn;
-}
-
-
-/**
-* @fn bool bMeshNetworkCheckMacEquality(const uint8_t* const cpcu8aMAC, const uint8_t* const cpcu8bMAC)
-* @brief returns true if MAC address is equal, compares only the first 5 bytes, the last is node specific
-* @param cpcu8aMAC first MAC
-* @param cpcu8bMAC second MAC
-* @return boolean
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-bool bMeshNetworkCheckMacEquality(const uint8_t* const cpcu8aMAC, const uint8_t* const cpcu8bMAC)
-{
-    bool bRet = true;
-    uint8_t index = 0;
-
-    while ((index < 5) && (bRet == true))
-        {
-            if(cpcu8aMAC[index] != cpcu8bMAC[index])
-                {
-                    bRet = false;
-                }
-            index++;
-        }
-    return bRet;
-}
-
-/**
-* @fn esp_err_t errMeshNetworkStartReceiveTask()
-* @brief start the task to receive the mesh packets
-* @param void
-* @return ESP32 error code
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-esp_err_t errMeshNetworkStartReceiveTask(void)
-{
-    esp_err_t err = ESP_OK;
-    BaseType_t xReturned;
-
-    xReturned = xTaskCreate(vMeshNetworkTaskReceiveMeshData, "ReceiveMeshData", 7000, NULL, 5, NULL);
-
-    if(xReturned != pdPASS)
-        {
-            err = ESP_FAIL;
-        }
-    return err;
-}
-
-/**
-* @fn vMeshNetworkGetOwnAddr(mesh_addr_t* const cpMeshOwnAddr)
-* @brief return own MAC addr
-* @param cpMeshOwnAddr pointer to own mac
-* @return void
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-void vMeshNetworkGetOwnAddr(mesh_addr_t* const cpMeshOwnAddr)
-{
-    memcpy(cpMeshOwnAddr->addr, u8ownMAC, 6);
-}
-
-/**
-* @fn esp_err_t errMeshNetworkGetChildren(mesh_addr_t* const cpChildren, uint16_t* const cpu16ChildrenSize)
-* @brief get all connected children to node in array
-* @param cpChildren pointer to array
-* @param cpu16ChildrenSize pointer to size of array
-* @return ESP32 error code
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-esp_err_t errMeshNetworkGetChildren(mesh_addr_t* const cpChildren, uint16_t* const cpu16ChildrenSize)
-{
-    esp_err_t err = ESP_OK;
-    int route_table_size = 0;
-    *cpu16ChildrenSize = 0;
-    mesh_addr_t route_table[CONFIG_MESH_ROUTE_TABLE_SIZE];
-    ERROR_CHECK(esp_mesh_get_routing_table((mesh_addr_t *) &route_table, (CONFIG_MESH_ROUTE_TABLE_SIZE * 6), &route_table_size));
-
-    if (err == ESP_OK)
-        {
-            for(uint16_t index = 0; index < esp_mesh_get_routing_table_size(); index++)
-                {
-                    if(! (bMeshNetworkCheckMacEquality(u8ownMAC, route_table[index].addr))  )
-                        {
-                            //child node
-                            cpChildren[*cpu16ChildrenSize] = route_table[index];
-                            (*cpu16ChildrenSize) =  (*cpu16ChildrenSize)+1;
-                        }
-                }
-        }
-    return err;
-}
-
-/**
-* @fn void vMeshNetworkTaskReceiveMeshData(void *arg)
-* @brief Task to receive all mesh packets
-* @param arg
-* @return void
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-void vMeshNetworkTaskReceiveMeshData(void *arg)
-{
-    esp_err_t err;
-    mesh_addr_t from;
-    mesh_data_t data;
-    uint8_t rx_buf[CONFIG_MESH_MESSAGE_SIZE] = { 0, };
-    int flag = 0;
-    data.data = rx_buf;
-    data.size = CONFIG_MESH_MESSAGE_SIZE;
-
-    while (true)
-        {
-            data.size = CONFIG_MESH_MESSAGE_SIZE;
-            err = esp_mesh_recv(&from, &data, portMAX_DELAY, &flag, NULL, 0);
-            if (err != ESP_OK || !data.size)
-                {
-                    ESP_LOGE(LOG_TAG, "err:0x%x, size:%d", err, data.size);
-                    continue;
-                }
-            MESH_PACKET_t packet;
-            memcpy(&packet, (uint8_t *)rx_buf, sizeof(MESH_PACKET_t)); //parse MESH_PACKET_t
-            memcpy(&packet.meshSenderAddr, &from, sizeof(mesh_addr_t)); //copy sender into packet
-
-            switch (packet.type)
-                {
-                case APP_Data:
-                    ESP_LOGD(LOG_TAG, "recv: APP_Data");
-                    //call the rx handle from app
-                    pAppRxHandle(packet.au8Payload, from.addr);  //hand over payload and sender of this mesh packet
-                    break;
-                case OTA_Version_Request:
-                case OTA_Version_Response:
-                case OTA_Data:
-                case OTA_ACK:
-                case OTA_Complete:
-                case OTA_Abort:
-                    //call the rx handle from OTA
-                    if(pOTAMessageHandle)
-                        {
-                            pOTAMessageHandle(&packet);
-                        }
-                    break;
-                default:
-                    ESP_LOGE(LOG_TAG, "recv: something");
-                    break;
-                }//end switch
-        } //end while
-}
-
-/**
-* @fn esp_err_t errMeshNetworkGetParentNode(mesh_addr_t* const cpMeshParentAddr)
-* @brief get parrent node if connected to it
-* @param cpMeshParentAddr pointer to parent node addrs
-* @return ESP32 error code
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-esp_err_t errMeshNetworkGetParentNode(mesh_addr_t* const cpMeshParentAddr)
-{
-    esp_err_t err = ESP_OK;
-
-    if((bIsMeshConnected == false) || (esp_mesh_is_root()))
-        {
-            //this node is not connected or is the root --> this node has no parent
-            err = ESP_FAIL;
-        }
-    else
-        {
-            //node has parent
-            memcpy(cpMeshParentAddr, &meshParentAddr, sizeof(mesh_addr_t));
-        }
-    return err;
-}
-
-
-
-
--- a/components/mesh_ota/Mesh_Network_Handler.c
+++ b/components/mesh_ota/Mesh_Network_Handler.c
@ -1,261 +0,0 @@
-
-/**
-* @file Mesh_Network_Handler.c
-* @brief Handler for events from mesh network (no messages)
-* @author Hendrik Schutter
-* @date 20.01.2021
-*
-* Additional Infos: IP event received or parrent or child connected or disconnected
-*/
-
-#include "Mesh_Network.h"
-
-static const char *LOG_TAG = "mesh_network_handler";
-
-/**
-* @fn void vMeshNetworkIpEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventID, void *vpEventData)
-* @brief received an IP event
-* @param arg
-* @param event_base
-* @param i32EventID
-* @param vpEventData
-* @return void
-* @author ESP-IDF
-* @date 20.01.2021
-*/
-void vMeshNetworkIpEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventID, void *vpEventData)
-{
-    ip_event_got_ip_t *event = (ip_event_got_ip_t *) vpEventData;
-    ESP_LOGI(LOG_TAG, "<IP_EVENT_STA_GOT_IP>IP:" IPSTR, IP2STR(&event->ip_info.ip));
-    if(pChangeStateOfServerWorkerHandle)
-        {
-            pChangeStateOfServerWorkerHandle(true);   //signal that this node (root node) has access to internet
-        }
-}
-
-/**
-* @fn void vMeshNetworkMeshEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventID, void* vpEventData)
-* @brief received an mesh event
-* @param arg
-* @param event_base
-* @param i32EventID
-* @param vpEventData
-* @return void
-* @author ESP-IDF
-* @date 20.01.2021
-*/
-void vMeshNetworkMeshEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventID, void* vpEventData)
-{
-    mesh_addr_t id = {0,};
-    static uint16_t last_layer = 0;
-
-    switch (i32EventID)
-        {
-        case MESH_EVENT_STARTED:
-        {
-            esp_mesh_get_id(&id);
-            ESP_LOGI(LOG_TAG, "<MESH_EVENT_MESH_STARTED>ID:"MACSTR"", MAC2STR(id.addr));
-bIsMeshConnected = false;
-i32MeshLayer = esp_mesh_get_layer();
-}
-break;
-        case MESH_EVENT_STOPPED: 
-{
-ESP_LOGI(LOG_TAG, "<MESH_EVENT_STOPPED>");
-bIsMeshConnected = false;
-i32MeshLayer = esp_mesh_get_layer();
-}
-break;
-        case MESH_EVENT_CHILD_CONNECTED: 
-{
-mesh_event_child_connected_t *child_connected = (mesh_event_child_connected_t *)vpEventData;
-ESP_LOGI(LOG_TAG, "<MESH_EVENT_CHILD_CONNECTED>aid:%d, "MACSTR"", child_connected->aid, MAC2STR(child_connected->mac));
-
-if(pOTAChildConnectHandle){pOTAChildConnectHandle(child_connected->mac);}//add this child to queue using handle
-
-}
-break;
-        case MESH_EVENT_CHILD_DISCONNECTED: 
-{
-mesh_event_child_disconnected_t *child_disconnected = (mesh_event_child_disconnected_t *)vpEventData;
-ESP_LOGI(LOG_TAG, "<MESH_EVENT_CHILD_DISCONNECTED>aid:%d, "MACSTR"",
-child_disconnected->aid,
-MAC2STR(child_disconnected->mac));
-}
-break;
-        case MESH_EVENT_ROUTING_TABLE_ADD: 
-{
-mesh_event_routing_table_change_t *routing_table = (mesh_event_routing_table_change_t *)vpEventData;
-ESP_LOGW(LOG_TAG, "<MESH_EVENT_ROUTING_TABLE_ADD>add %d, new:%d, layer:%d",
-routing_table->rt_size_change,
-routing_table->rt_size_new, i32MeshLayer);
-}
-break;
-        case MESH_EVENT_ROUTING_TABLE_REMOVE: 
-{   
-mesh_event_routing_table_change_t *routing_table = (mesh_event_routing_table_change_t *)vpEventData;
-ESP_LOGW(LOG_TAG, "<MESH_EVENT_ROUTING_TABLE_REMOVE>remove %d, new:%d, layer:%d",
-routing_table->rt_size_change,
-routing_table->rt_size_new, i32MeshLayer);
-}
-break;
-        case MESH_EVENT_NO_PARENT_FOUND: 
-{
-mesh_event_no_parent_found_t *no_parent = (mesh_event_no_parent_found_t *)vpEventData;
-ESP_LOGI(LOG_TAG, "<MESH_EVENT_NO_PARENT_FOUND>scan times:%d",
-no_parent->scan_times);
-/* TODO handler for the failure, maybe nominate themselves */
-}
-break;
-        case MESH_EVENT_PARENT_CONNECTED: 
-{
-mesh_event_connected_t *connected = (mesh_event_connected_t *)vpEventData;
-esp_mesh_get_id(&id);
-i32MeshLayer = connected->self_layer;
-memcpy(&meshParentAddr.addr, connected->connected.bssid, 6); 
-ESP_LOGI(LOG_TAG, "<MESH_EVENT_PARENT_CONNECTED>layer:%d-->%d, parent:"MACSTR"%s, ID:"MACSTR", duty:%d",
-last_layer, i32MeshLayer, MAC2STR(meshParentAddr.addr),
-esp_mesh_is_root() ? "<ROOT>" : (i32MeshLayer == 2) ? "<layer2>" : "", //print own node title
-MAC2STR(id.addr), connected->duty);
-last_layer = i32MeshLayer;
-bIsMeshConnected = true;
-if (esp_mesh_is_root()) 
-{
-if(esp_netif_dhcpc_start(pNetifSta) == ESP_ERR_ESP_NETIF_DHCP_ALREADY_STARTED) //get a IP from router
-{
-if(pChangeStateOfServerWorkerHandle){pChangeStateOfServerWorkerHandle(true);}// signal reconnect
-} 
-}
-errMeshNetworkStartReceiveTask();//start receiving
-}
-break;
-        case MESH_EVENT_PARENT_DISCONNECTED: 
-{
-mesh_event_disconnected_t *disconnected = (mesh_event_disconnected_t *)vpEventData;
-ESP_LOGI(LOG_TAG, "<MESH_EVENT_PARENT_DISCONNECTED>reason:%d", disconnected->reason);
-bIsMeshConnected = false;
-if(pChangeStateOfServerWorkerHandle){pChangeStateOfServerWorkerHandle(false);}
-i32MeshLayer = esp_mesh_get_layer();
-}
-break;
-        case MESH_EVENT_LAYER_CHANGE: 
-{
-mesh_event_layer_change_t *layer_change = (mesh_event_layer_change_t *)vpEventData;
-i32MeshLayer = layer_change->new_layer;
-ESP_LOGI(LOG_TAG, "<MESH_EVENT_LAYER_CHANGE>layer:%d-->%d%s",
-last_layer, i32MeshLayer,
-esp_mesh_is_root() ? "<ROOT>" : (i32MeshLayer == 2) ? "<layer2>" : "");
-last_layer = i32MeshLayer;
-}
-break;
-        case MESH_EVENT_ROOT_ADDRESS: 
-{
-mesh_event_root_address_t *root_addr = (mesh_event_root_address_t *)vpEventData;
-ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROOT_ADDRESS>root address:"MACSTR"",
-MAC2STR(root_addr->addr));
-}
-break;
-        case MESH_EVENT_VOTE_STARTED: 
-{
-mesh_event_vote_started_t *vote_started = (mesh_event_vote_started_t *)vpEventData;
-ESP_LOGI(LOG_TAG, "<MESH_EVENT_VOTE_STARTED>attempts:%d, reason:%d, rc_addr:"MACSTR"",
-vote_started->attempts,
-vote_started->reason,
-MAC2STR(vote_started->rc_addr.addr));
-}
-break;
-        case MESH_EVENT_VOTE_STOPPED: 
-{
-ESP_LOGI(LOG_TAG, "<MESH_EVENT_VOTE_STOPPED>");
-}
-break;
-        case MESH_EVENT_ROOT_SWITCH_REQ: 
-{
-mesh_event_root_switch_req_t *switch_req = (mesh_event_root_switch_req_t *)vpEventData;
-ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROOT_SWITCH_REQ>reason:%d, rc_addr:"MACSTR"", switch_req->reason,
-MAC2STR( switch_req->rc_addr.addr));
-}
-break;
-        case MESH_EVENT_ROOT_SWITCH_ACK: 
-{
-//new root
-i32MeshLayer = esp_mesh_get_layer();
-esp_mesh_get_parent_bssid(&meshParentAddr);
-ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROOT_SWITCH_ACK>layer:%d, parent:"MACSTR"", i32MeshLayer, MAC2STR(meshParentAddr.addr));
-}
-break;
-        case MESH_EVENT_TODS_STATE: 
-{
-mesh_event_toDS_state_t *toDs_state = (mesh_event_toDS_state_t *)vpEventData;
-ESP_LOGI(LOG_TAG, "<MESH_EVENT_TODS_REACHABLE>state:%d", *toDs_state);
-}
-break;
-        case MESH_EVENT_ROOT_FIXED: 
-{
-mesh_event_root_fixed_t *root_fixed = (mesh_event_root_fixed_t *)vpEventData;
-ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROOT_FIXED>%s",
-root_fixed->is_fixed ? "fixed" : "not fixed");
-}
-break;
-        case MESH_EVENT_ROOT_ASKED_YIELD: 
-{
-mesh_event_root_conflict_t *root_conflict = (mesh_event_root_conflict_t *)vpEventData;
-ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROOT_ASKED_YIELD>"MACSTR", rssi:%d, capacity:%d",
-MAC2STR(root_conflict->addr), root_conflict->rssi, root_conflict->capacity);
-}
-break;
-        case MESH_EVENT_CHANNEL_SWITCH: 
-{
-mesh_event_channel_switch_t *channel_switch = (mesh_event_channel_switch_t *)vpEventData;
-ESP_LOGI(LOG_TAG, "<MESH_EVENT_CHANNEL_SWITCH>new channel:%d", channel_switch->channel);
-}
-break;
-        case MESH_EVENT_SCAN_DONE: 
-{
-mesh_event_scan_done_t *scan_done = (mesh_event_scan_done_t *)vpEventData;
-ESP_LOGI(LOG_TAG, "<MESH_EVENT_SCAN_DONE>number:%d", scan_done->number);
-}
-break;
-        case MESH_EVENT_NETWORK_STATE: 
-{
-mesh_event_network_state_t *network_state = (mesh_event_network_state_t *)vpEventData;
-ESP_LOGI(LOG_TAG, "<MESH_EVENT_NETWORK_STATE>is_rootless:%d", network_state->is_rootless);
-}
-break;
-        case MESH_EVENT_STOP_RECONNECTION: 
-{
-ESP_LOGI(LOG_TAG, "<MESH_EVENT_STOP_RECONNECTION>");    
-}
-break;
-        case MESH_EVENT_FIND_NETWORK: 
-{
-mesh_event_find_network_t *find_network = (mesh_event_find_network_t *)vpEventData;
-ESP_LOGI(LOG_TAG, "<MESH_EVENT_FIND_NETWORK>new channel:%d, router BSSID:"MACSTR"",
-find_network->channel, MAC2STR(find_network->router_bssid));
-}
-break;
-        case MESH_EVENT_ROUTER_SWITCH: 
-{
-mesh_event_router_switch_t *router_switch = (mesh_event_router_switch_t *)vpEventData;
-ESP_LOGI(LOG_TAG, "<MESH_EVENT_ROUTER_SWITCH>new router:%s, channel:%d, "MACSTR"",
-router_switch->ssid, router_switch->channel, MAC2STR(router_switch->bssid));
-}
-break;
-        case MESH_EVENT_PS_PARENT_DUTY: 
-{
-mesh_event_ps_duty_t *ps_duty = (mesh_event_ps_duty_t *)vpEventData;
-ESP_LOGI(LOG_TAG, "<MESH_EVENT_PS_PARENT_DUTY>duty:%d", ps_duty->duty);
-}
-break;
-        case MESH_EVENT_PS_CHILD_DUTY: 
-{
-mesh_event_ps_duty_t *ps_duty = (mesh_event_ps_duty_t *)vpEventData;
-ESP_LOGI(LOG_TAG, "<MESH_EVENT_PS_CHILD_DUTY>cidx:%d, "MACSTR", duty:%d", ps_duty->child_connected.aid-1,
-MAC2STR(ps_duty->child_connected.mac), ps_duty->duty);
-}
-break;
-        default:
-            ESP_LOGI(LOG_TAG, "unknown id:%d", i32EventID);
-        break;
-    }
-}
--- a/components/mesh_ota/Mesh_OTA.c
+++ b/components/mesh_ota/Mesh_OTA.c
@ -1,386 +0,0 @@
-/**
-* @file Mesh_OTA.c
-* @brief Start and implement OTA updates via HTTPS from server and other mesh nodes (bidirectional)
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-
-#include "Mesh_OTA.h"
-#include "Mesh_OTA_Util.h"
-#include "Mesh_OTA_Globals.h"
-#include "Mesh_OTA_Partition_Access.h"
-
-static const char *LOG_TAG = "mesh_ota";
-
-/**
-* @fn esp_err_t errMeshOTAInitialize(void)
-* @brief Starts Mesh OTA functionality
-* @param void
-* @return ESP32 error code
-* @author Hendrik Schutter
-* @date 21.01.2021
-*
-* Initialize queues and tasks
-* Set callbacks
-*/
-esp_err_t errMeshOTAInitialize(void)
-{
-    esp_err_t err = ESP_OK;
-    BaseType_t xReturned;
-    bWantReboot = false;
-
-    //create queue to store nodes for ota worker task
-    queueNodes = xQueueCreate(QUEUE_NODES_SIZE, sizeof(mesh_addr_t));
-    if (queueNodes == 0)  // Queue not created
-        {
-            ESP_LOGE(LOG_TAG, "Unable to create queue for nodes");
-            err = ESP_FAIL;
-        }
-
-    if(err == ESP_OK)
-        {
-            //create queue to store ota messages
-            queueMessageOTA = xQueueCreate(QUEUE_MESSAGE_OTA_SIZE, sizeof(MESH_PACKET_t));
-            if (queueMessageOTA == 0)  // Queue not created
-                {
-                    ESP_LOGE(LOG_TAG, "Unable to create queue for OTA messages");
-                    err = ESP_FAIL;
-                }
-        }
-
-    if(err == ESP_OK)
-        {
-            bsStartStopServerWorker = xSemaphoreCreateBinary();
-            if( bsStartStopServerWorker == NULL )
-                {
-                    ESP_LOGE(LOG_TAG, "Unable to create mutex to represent state of server worker");
-                    err = ESP_FAIL;
-                }
-        }
-
-    if(err == ESP_OK)
-        {
-            bsOTAProcess = xSemaphoreCreateBinary();
-            if( bsOTAProcess == NULL )
-                {
-                    ESP_LOGE(LOG_TAG, "Unable to create mutex to grant access to OTA process");
-                    err = ESP_FAIL;
-                }
-        }
-
-    if(err == ESP_OK)
-        {
-            xSemaphoreGive(bsOTAProcess);  //unlock binary semaphore
-            if( bsOTAProcess == NULL )
-                {
-                    ESP_LOGE(LOG_TAG, "Unable to unlock mutex to grant access to OTA process");
-                    err = ESP_FAIL;
-                }
-        }
-
-    //register callbacks in network
-    ERROR_CHECK(errMeshNetworkSetChildConnectedHandle(vMeshOtaUtilAddNodeToPossibleUpdatableQueue));
-    ERROR_CHECK(errMeshNetworkSetOTAMessageHandleHandle(vMeshOtaUtilAddOtaMessageToQueue));
-    ERROR_CHECK(errMeshNetworkSetChangeStateOfServerWorkerHandle(vMeshOtaUtilChangeStateOfServerWorker));
-
-    if(err == ESP_OK)
-        {
-            pOTAPartition =  esp_ota_get_next_update_partition(NULL); //get ota partition
-
-            if(pOTAPartition == NULL)
-                {
-                    err = ESP_FAIL;
-                    ESP_LOGE(LOG_TAG, "unable to get next ota partition");
-                }
-        }
-
-    if(err == ESP_OK)
-        {
-            xReturned = xTaskCreate(vMeshOtaTaskServerWorker, "vMeshOtaTaskServerWorker", 8192, NULL, 5, NULL);
-            if(xReturned != pdPASS)
-                {
-                    ESP_LOGE(LOG_TAG, "Unable to create the server worker task");
-                    err = ESP_FAIL;
-                }
-        }
-
-
-    if(err == ESP_OK)
-        {
-            xReturned = xTaskCreate(vMeshOtaTaskOTAWorker, "vMeshOtaTaskOTAWorker", 8192, NULL, 5, NULL);
-            if(xReturned != pdPASS)
-                {
-                    ESP_LOGE(LOG_TAG, "Unable to create the OTA worker task");
-                    err = ESP_FAIL;
-                }
-        }
-    return err;
-}
-
-/**
-* @fn void vMeshOtaTaskServerWorker(void *arg)
-* @brief Task for updating from server via HTTPS
-* @param arg
-* @return void
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-void vMeshOtaTaskServerWorker(void *arg)
-{
-    esp_err_t err = ESP_OK;
-    bool bNewOTAImage; //true if a new ota image was downloaded and validated
-    bool bFirstRun = true;
-
-    while(true)
-        {
-            err = ESP_OK;
-            bNewOTAImage = false;
-            xSemaphoreTake(bsStartStopServerWorker, portMAX_DELAY); //wait for binary semaphore that allows to start the worker
-            xSemaphoreGive(bsStartStopServerWorker); //free binary semaphore, this allows the handler to change is to taken
-
-            if (esp_mesh_is_root()) //check again that this node is the root node
-                {
-                    ESP_LOGI(LOG_TAG, "Checking firmware image on server");
-
-                    if(bFirstRun == true)
-                        {
-                            //init on first run
-                            ERROR_CHECK(errHTTPSClientInitialize());
-                            bFirstRun = false;
-                        }
-
-                    ERROR_CHECK(errHTTPSClientConnectToServer());
-                    ERROR_CHECK(errHTTPSClientValidateServer());
-                    ERROR_CHECK(errHTTPSClientSendRequest());
-
-                    ERROR_CHECK(errMeshOtaPartitionAccessHttps(&bNewOTAImage));
-                    errHTTPSClientReset();
-
-                    if(bNewOTAImage == true)
-                        {
-                            //set want reboot
-                            ESP_LOGI(LOG_TAG, "Updated successfully via HTTPS, set pending reboot");
-                            bWantReboot = true;
-                        }
-                    vTaskDelay( (SERVER_CHECK_INTERVAL*1000) / portTICK_PERIOD_MS); //sleep till next server checks
-                }
-        }
-}
-
-/**
-* @fn void vMeshOtaTaskServerWorker(void *arg)
-* @brief Task for updating from nodes in mesh network
-* @param arg
-* @return void
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-void vMeshOtaTaskOTAWorker(void *arg)
-{
-    esp_err_t err = ESP_OK;
-    bool bNewOTAImage; //true if a new ota image was downloaded and validated
-    mesh_addr_t meshNodeAddr; //node that should be checked for ota update
-    BaseType_t xReturned;
-
-    while(true)
-        {
-            err = ESP_OK;
-            bNewOTAImage = false;
-
-            if((uxQueueSpacesAvailable(queueNodes) - QUEUE_NODES_SIZE) == 0)
-                {
-                    //nodes queue is empty
-
-                    xReturned =  xSemaphoreTake(bsOTAProcess, portMAX_DELAY); //wait for binary semaphore that allows to start the OTA process
-                    if((xReturned == pdTRUE) && (bWantReboot == true) && (OTA_ALLOW_REBOOT == 1))
-                        {
-                            ESP_LOGE(LOG_TAG, "ESP32 Reboot ...");
-                            vTaskDelay( (1000) / portTICK_PERIOD_MS);
-                            esp_restart();
-                        }
-
-                    xSemaphoreGive(bsOTAProcess); //free binary semaphore, this allows other tasks to start the OTA process
-                    ERROR_CHECK(errMeshOtaSlaveEndpoint(&bNewOTAImage, &meshNodeAddr));
-                }
-            else
-                {
-                    //queue not empty
-                    if (xQueueReceive(queueNodes, &meshNodeAddr, ((100) / portTICK_PERIOD_MS)) != pdTRUE)
-                        {
-                            ESP_LOGE(LOG_TAG, "Unable to receive OTA Messages from Queue");
-                            err = ESP_FAIL;
-                        }
-
-                    ERROR_CHECK(errMeshOtaMasterEndpoint(&bNewOTAImage, &meshNodeAddr));
-
-                    if (err != ESP_OK)
-                        {
-                            //OTA process faild --> add back to queue
-                            vMeshOtaUtilAddNodeToPossibleUpdatableQueue(meshNodeAddr.addr);
-                        }
-                    else
-                        {
-                            vMeshOtaUtilClearNeighboursQueue(&meshNodeAddr); //remove this node from queue
-                        }
-                }
-
-            if(bNewOTAImage == true)
-                {
-                    //set want reboot
-                    ESP_LOGI(LOG_TAG, "Updated successfully via Mesh, set pending reboot");
-                    bWantReboot = true;
-
-                    vMeshOtaUtilAddAllNeighboursToQueue(&meshNodeAddr); //add all existing neighbours to queue
-                }
-            vTaskDelay( (1000) / portTICK_PERIOD_MS);
-        }
-}
-
-/**
-* @fn esp_err_t errMeshOtaSlaveEndpoint(bool* const cpbNewOTAImage)
-* @brief Endpoint for OTA process that is called from remote node
-* @param cpbNewOTAImage pointer to boolean to signal if a new image was successfully received
-* @param cpcMeshNodeAddr pointer to mesh node that transmitted the update
-* @return ESP32 error code
-* @author Hendrik Schutter
-* @date 21.01.2021
-*
-* Answers the OTA_Version_Request with OTA_Version_Response
-* calls errMeshOtaPartitionAccessMeshReceive OR errMeshOtaPartitionAccessMeshTransmit based on version number
-*/
-esp_err_t errMeshOtaSlaveEndpoint(bool* const cpbNewOTAImage, mesh_addr_t* const cpcMeshNodeAddr)
-{
-    esp_err_t err = ESP_OK;
-    MESH_PACKET_t sOTAMessage;
-    const esp_partition_t* cpBootPartition = NULL; //pointer to boot partition (that will booted after reset)
-    esp_app_desc_t bootPartitionDesc; //Metadate from boot partition
-    *cpbNewOTAImage = false; //set default false
-
-    //read OTAMessages queue
-    if(uxQueueSpacesAvailable(queueMessageOTA) < QUEUE_MESSAGE_OTA_SIZE)
-        {
-            //queue not empty
-            if (xQueueReceive(queueMessageOTA, &sOTAMessage, ((100) / portTICK_PERIOD_MS)) != pdTRUE)
-                {
-                    err = ESP_FAIL;
-                }
-
-            if((err == ESP_OK) && (sOTAMessage.type == OTA_Version_Request)) //if OTA_Version_Request
-                {
-                    xSemaphoreTake(bsOTAProcess, portMAX_DELAY); //wait for binary semaphore that allows to start the OTA process
-
-                    memcpy(cpcMeshNodeAddr, &sOTAMessage.meshSenderAddr, sizeof(mesh_addr_t));
-
-                    cpBootPartition = esp_ota_get_boot_partition(); //get boot partition (that will booted after reset), not the running partition
-                    ERROR_CHECK(esp_ota_get_partition_description(cpBootPartition, &bootPartitionDesc)); //get metadata of partition
-
-                    //send OTA_Version_Response to sender of OTA_Version_Request packet wirh version in payload
-                    ERROR_CHECK(errMeshOtaUtilSendOtaVersionResponse(&sOTAMessage.meshSenderAddr));
-
-                    if((bMeshOtaUtilNewerVersion((bootPartitionDesc).version, (char*) sOTAMessage.au8Payload)) && (err == ESP_OK)) //compare local and remote version
-                        {
-                            //remote newer as local
-                            ESP_LOGI(LOG_TAG, "remote image on node is newer --> OTA update required from node \"%x:%x:%x:%x:%x:%x\"", sOTAMessage.meshSenderAddr.addr[0], sOTAMessage.meshSenderAddr.addr[1], sOTAMessage.meshSenderAddr.addr[2], sOTAMessage.meshSenderAddr.addr[3], sOTAMessage.meshSenderAddr.addr[4], sOTAMessage.meshSenderAddr.addr[5]);
-                            //  --> this version older --> start OTA_Rx --> set cpbNewOTAImage true
-                            ERROR_CHECK(errMeshOtaPartitionAccessMeshReceive(cpbNewOTAImage, &sOTAMessage.meshSenderAddr));
-                        }
-
-                    if((bMeshOtaUtilNewerVersion((char*) sOTAMessage.au8Payload, (bootPartitionDesc).version)) && (err == ESP_OK)) //compare remote and local version
-                        {
-                            //local newer as remote
-                            ESP_LOGI(LOG_TAG, "remote image on node is older --> OTA send required to node \"%x:%x:%x:%x:%x:%x\"", sOTAMessage.meshSenderAddr.addr[0], sOTAMessage.meshSenderAddr.addr[1], sOTAMessage.meshSenderAddr.addr[2], sOTAMessage.meshSenderAddr.addr[3], sOTAMessage.meshSenderAddr.addr[4], sOTAMessage.meshSenderAddr.addr[5]);
-                            //  --> this version newer --> start OTA_Tx
-                            ERROR_CHECK(errMeshOtaPartitionAccessMeshTransmit(&sOTAMessage.meshSenderAddr));
-                        }
-                    xSemaphoreGive(bsOTAProcess); //free binary semaphore, this allows other tasks to start the OTA process
-                }
-        }
-    return err;
-}
-
-/**
-* @fn esp_err_t errMeshOtaMasterEndpoint(bool* const cpbNewOTAImage, const mesh_addr_t* const cpcMeshNodeAddr)
-* @brief Endpoint for OTA process that calls remote node
-* @param cpbNewOTAImage pointer to boolean to signal if a new image was successfully received
-* @param cpcMeshNodeAddr pointer to remote node addr
-* @return ESP32 error code
-* @author Hendrik Schutter
-* @date 21.01.2021
-*
-* Sends the OTA_Version_Request to remote node
-* calls errMeshOtaPartitionAccessMeshReceive OR errMeshOtaPartitionAccessMeshTransmit based on version number received
-*/
-esp_err_t errMeshOtaMasterEndpoint(bool* const cpbNewOTAImage, const mesh_addr_t* const cpcMeshNodeAddr)
-{
-    esp_err_t err = ESP_OK;
-    MESH_PACKET_t sOTAMessage;
-    const esp_partition_t* cpBootPartition = NULL; //pointer to boot partition (that will booted after reset)
-    esp_app_desc_t bootPartitionDesc; //Metadata from boot partition
-    bool bNodeIsConnected = false;
-    bool bNodeIsResponding = false;
-    bool bSameVersion = false;
-
-    *cpbNewOTAImage = false; //set default false
-
-    if(bMeshNetworkIsNodeNeighbour(cpcMeshNodeAddr) == true) //check if node is still connected
-        {
-            bNodeIsConnected = true; //node is one of the neighbours
-            xSemaphoreTake(bsOTAProcess, portMAX_DELAY); //wait for binary semaphore that allows to start the OTA process
-
-            ERROR_CHECK(errMeshOtaUtilSendOtaVersionRequest(cpcMeshNodeAddr)); //send OTA_VERSION_REQUEST with local version in payload
-
-            for (uint32_t u32Index = 0; ((u32Index < QUEUE_MESSAGE_OTA_SIZE) && (bSameVersion == false)); u32Index++) //loop through all OTA messages
-                {
-                    //if(uxQueueSpacesAvailable(queueMessageOTA) < QUEUE_MESSAGE_OTA_SIZE)
-                    //  {
-                    //queue not empty
-                    if (xQueueReceive(queueMessageOTA, &sOTAMessage, ((3000) / portTICK_PERIOD_MS)) != pdTRUE)
-                        {
-                            ESP_LOGE(LOG_TAG, "Unable to receive OTA Messages from queue");
-                            err = ESP_FAIL;
-                        }
-
-                    if((err == ESP_OK) && (sOTAMessage.type == OTA_Version_Response) && (bMeshNetworkCheckMacEquality(sOTAMessage.meshSenderAddr.addr, cpcMeshNodeAddr->addr))) //if OTA_Version_Request
-                        {
-                            bSameVersion = true;
-                            bNodeIsResponding = true;
-                            cpBootPartition = esp_ota_get_boot_partition(); //get boot partition (that will booted after reset), not the running partition
-                            ERROR_CHECK(esp_ota_get_partition_description(cpBootPartition, &bootPartitionDesc)); //get metadata of partition
-
-                            if((bMeshOtaUtilNewerVersion((bootPartitionDesc).version, (char*) sOTAMessage.au8Payload)) && (err == ESP_OK)) //compare local and remote version
-                                {
-                                    //remote newer as local
-                                    bSameVersion = false;
-                                    ESP_LOGI(LOG_TAG, "remote image on node is newer --> OTA update required from node \"%x:%x:%x:%x:%x:%x\"", sOTAMessage.meshSenderAddr.addr[0], sOTAMessage.meshSenderAddr.addr[1], sOTAMessage.meshSenderAddr.addr[2], sOTAMessage.meshSenderAddr.addr[3], sOTAMessage.meshSenderAddr.addr[4], sOTAMessage.meshSenderAddr.addr[5]);
-                                    //  --> this version older --> start OTA_Rx --> set cpbNewOTAImage true
-                                    ERROR_CHECK(errMeshOtaPartitionAccessMeshReceive(cpbNewOTAImage, &sOTAMessage.meshSenderAddr));
-                                    u32Index = QUEUE_MESSAGE_OTA_SIZE;
-                                }
-
-                            if((bMeshOtaUtilNewerVersion((char*) sOTAMessage.au8Payload, (bootPartitionDesc).version)) && (err == ESP_OK)) //compare remote and local version
-                                {
-                                    //local newer as remote
-                                    bSameVersion = false;
-                                    ESP_LOGI(LOG_TAG, "remote image on node is older --> OTA send required to node \"%x:%x:%x:%x:%x:%x\"", sOTAMessage.meshSenderAddr.addr[0], sOTAMessage.meshSenderAddr.addr[1], sOTAMessage.meshSenderAddr.addr[2], sOTAMessage.meshSenderAddr.addr[3], sOTAMessage.meshSenderAddr.addr[4], sOTAMessage.meshSenderAddr.addr[5]);
-                                    //  --> this version newer --> start OTA_Tx
-                                    ERROR_CHECK(errMeshOtaPartitionAccessMeshTransmit(&sOTAMessage.meshSenderAddr));
-                                    u32Index = QUEUE_MESSAGE_OTA_SIZE;
-                                }
-                        }
-                    else
-                        {
-                            // OTA Message queue is empty --> wait some time
-                            vTaskDelay( (1000/QUEUE_MESSAGE_OTA_SIZE) / portTICK_PERIOD_MS);
-                        }
-                }//end loop
-            xSemaphoreGive(bsOTAProcess); //free binary semaphore, this allows other tasks to start the OTA process
-        }
-
-    if((bNodeIsResponding == false) && (bNodeIsConnected == true))
-        {
-            //add node back to queue if connected and NOT responding
-            ESP_LOGI(LOG_TAG, "OTA-Master: connected and NOT responding --> add node back to queue ");
-            vMeshOtaUtilAddNodeToPossibleUpdatableQueue(cpcMeshNodeAddr->addr);
-        }
-    return err;
-}
--- a/components/mesh_ota/Mesh_OTA_Globals.c
+++ b/components/mesh_ota/Mesh_OTA_Globals.c
@ -1,22 +0,0 @@
-/**
-* @file Mesh_OTA_Globals.c
-* @brief global variables unsed in Mesh_OTA
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-
-#include "Mesh_OTA_Globals.h"
-
-xQueueHandle queueNodes; //nodes that should be checked for ota update (contains children and parent)
-xQueueHandle queueMessageOTA; //mesh ota controll messages like "OTA_Version_Response" "OTA_ACK"
-
-SemaphoreHandle_t bsStartStopServerWorker; //binary semaphore
-SemaphoreHandle_t bsOTAProcess; //binary semaphore
-
-//w: errMeshOTAInitialize;
-//r: errMeshOTAInitialize; errMeshOtaPartitionAccessHttps; errMeshOtaPartitionAccessMeshReceive;
-const esp_partition_t* pOTAPartition; //pointer to ota partition
-
-//w: errMeshOTAInitialize; vMeshOtaTaskOTAWorker; vMeshOtaTaskServerWorker
-//r: errMeshOTAInitialize; vMeshOtaTaskOTAWorker; vMeshOtaTaskServerWorker
-bool bWantReboot; //flag to signal pending reboot
--- a/components/mesh_ota/Mesh_OTA_Partition_Access.c
+++ b/components/mesh_ota/Mesh_OTA_Partition_Access.c
@ -1,341 +0,0 @@
-/**
-* @file Mesh_OTA_Partition_Access.c
-* @brief Write and read partition if requested from Mesh_OTA
-* @author Hendrik Schutter
-* @date 21.01.2021
-*
-* Additional Infos: Write image via HTTPS
-*                   Receive or transmit via Mesh
-*/
-
-#include "Mesh_OTA.h"
-#include "Mesh_OTA_Util.h"
-#include "Mesh_OTA_Globals.h"
-#include "Mesh_OTA_Partition_Access.h"
-
-static const char *LOG_TAG = "mesh_ota_partition_access";
-
-/**
-* @fn esp_err_t errMeshOtaPartitionAccessHttps(bool* const cpbNewOTAImage)
-* @brief Downloads and writes the image from the server to partition
-* @param cpbNewOTAImage pointer to boolean to signal if a new image was successfully received
-* @return ESP32 error code
-* @author Hendrik Schutter
-* @date 21.01.2021
-*
-* Checks if the image on server is newer
-* Downloads the image in segements
-* Handles OTA process
-*/
-esp_err_t errMeshOtaPartitionAccessHttps(bool* const cpbNewOTAImage)
-{
-    esp_err_t err = ESP_OK;
-    char u8OTABuffer[OTA_HTTPS_SEGMENT_SIZE]; //store image segment from server before ota write
-    uint32_t u32BufferLenght = OTA_HTTPS_SEGMENT_SIZE; //size of buffer
-    uint32_t u32BytesRead = 0; //number of bytes that are read from server, <= u32BufferLenght
-    char pcRemoteVersionNumber[12]; //string for version number in server image
-    const esp_partition_t* pBootPartition; //pointer to boot partition (that will booted after reset)
-    static esp_ota_handle_t otaHandle; //OTA process handle
-    uint32_t u32StartOffset = 0U; //start offset for image (exclude the http response data)
-    esp_app_desc_t bootPartitionDesc; //Metadate from boot partition
-    uint32_t u32OTABytesWritten = 0U; //counter unsed for progress log
-
-    ERROR_CHECK(errHTTPSClientRetrieveData(u8OTABuffer, &u32BufferLenght, &u32BytesRead)); //read first bytes if image, including the version
-
-    ERROR_CHECK(errMeshOtaUtilExtractVersionNumber(u8OTABuffer, &u32BytesRead, pcRemoteVersionNumber)); //extract version numbers
-
-    //check if version number is found
-    if(err == ESP_OK)
-        {
-            xSemaphoreTake(bsOTAProcess, portMAX_DELAY); //wait for binary semaphore that allows to start the OTA process
-
-            pBootPartition = esp_ota_get_boot_partition(); //get boot partition (that will booted after reset), not the running partition
-            ERROR_CHECK(esp_ota_get_partition_description(pBootPartition, &bootPartitionDesc)); //get metadata of partition
-
-            if(bMeshOtaUtilNewerVersion((bootPartitionDesc).version, pcRemoteVersionNumber)) //compare local and remote version
-                {
-                    // server image is newer --> OTA update required
-                    ESP_LOGI(LOG_TAG, "Server: image is newer --> OTA update required");
-
-                    ERROR_CHECK(errMeshOtaUtilFindImageStart(u8OTABuffer, &u32BufferLenght, &u32StartOffset)); //get image start offset
-                    ERROR_CHECK(esp_ota_begin(pOTAPartition, OTA_SIZE_UNKNOWN, &otaHandle)); //start ota update process
-
-                    if(err == ESP_OK)
-                        {
-                            //image download and ota partition write
-                            ESP_LOGI(LOG_TAG, "start OTA download via HTTPS");
-                            do
-                                {
-                                    vMeshOtaUtilPrintOtaProgress(&(pOTAPartition->size), &u32OTABytesWritten, Receiver);
-                                    ERROR_CHECK(esp_ota_write(otaHandle, (const void*) u8OTABuffer+u32StartOffset, (u32BytesRead-u32StartOffset)));
-
-                                    if(err == ESP_OK)
-                                        {
-                                            //write was succsesfull
-                                            u32StartOffset = 0U; //reset the offset for next download
-                                            ERROR_CHECK(errHTTPSClientRetrieveData(u8OTABuffer, &u32BufferLenght, &u32BytesRead)); //download next data segment
-                                            u32OTABytesWritten = u32OTABytesWritten + u32BytesRead; //update counter
-                                        }
-                                }
-                            //loop until error or complete image downloaded
-                            while ((u32BytesRead > 0) && (err == ESP_OK) && (u32OTABytesWritten <= pOTAPartition->size));
-                        }
-
-                    if(err == ESP_OK)
-                        {
-                            //no error occurred --> finish ota update process
-                            ERROR_CHECK(esp_ota_end(otaHandle)); //finish process
-                            ERROR_CHECK(esp_ota_set_boot_partition(pOTAPartition)); //set new image as boot
-                            if(err == ESP_OK)
-                                {
-                                    *cpbNewOTAImage = true; //image validated
-                                    vMeshOtaUtilAddAllNeighboursToQueue(NULL); //add all existing neighbours to queue (aparent will not be added because this node is the root)
-                                }
-                        }
-                    else
-                        {
-                            //error occurred --> abort ota update process
-                            ESP_LOGE(LOG_TAG, "abort OTA process due to error 0x%x -> %s", err, esp_err_to_name(err));
-                            ERROR_CHECK(esp_ota_abort(otaHandle));
-                            *cpbNewOTAImage = false; //ota update failed
-                        }
-                }
-            else
-                {
-                    ESP_LOGI(LOG_TAG, "server image is NOT newer --> OTA update NOT required");
-                }
-            xSemaphoreGive(bsOTAProcess); //free binary semaphore, this allows other tasks to start the OTA process
-        } //end version number extracted
-    return err;
-}
-
-/**
-* @fn esp_err_t errMeshOtaPartitionAccessMeshTransmit(const mesh_addr_t* const cpcMeshNodeAddr)
-* @brief Reads the local image and sends it to node
-* @param cpcMeshNodeAddr pointer to mesh node addr to send the image segments to
-* @return ESP32 error code
-* @author Hendrik Schutter
-* @date 21.01.2021
-*
-* Reads the newest OTA image in segments
-* Sends the image to mesh node in segments
-* Handles OTA process
-*/
-esp_err_t errMeshOtaPartitionAccessMeshTransmit(const mesh_addr_t* const cpcMeshNodeAddr)
-{
-    esp_err_t err = ESP_OK;
-    const esp_partition_t* pBootPartition = NULL; //pointer to boot partition (that will booted after reset)
-    MESH_PACKET_t sMeshPacket; //packet for sending and receiving
-    // uint32_t u32Index = 0U; //index for partition read offset
-    bool bAbort = false; //abort the OTA process
-    bool bNodeIsResponding = false; //remote node is still active
-    uint32_t u32OTABytesWritten = 0U; //counter of bytes unsed for progress log
-    uint32_t u32SegmentCounter = 0U; //counter of segments unsed for progress log
-
-    pBootPartition = esp_ota_get_boot_partition(); //get boot partition (that will booted after reset), not the running partition
-
-    //loop through partition to read in segmensts until end or error or abort called
-    while( ((OTA_MESH_SEGMENT_SIZE * u32SegmentCounter) < pBootPartition->size) && (err == ESP_OK) && (bAbort == false))
-        {
-            bNodeIsResponding = false; //reset to default for this loop
-
-            // read partition with offset based in index
-            ERROR_CHECK(esp_partition_read(pBootPartition, (OTA_MESH_SEGMENT_SIZE * u32SegmentCounter), sMeshPacket.au8Payload, OTA_MESH_SEGMENT_SIZE));
-            u32OTABytesWritten = ((u32SegmentCounter+1) * OTA_MESH_SEGMENT_SIZE); //calc bytes that are written in this ota process
-            vMeshOtaUtilPrintOtaProgress(&(pBootPartition->size), &u32OTABytesWritten, Transmitter);
-
-            if(err == ESP_OK)
-                {
-                    //no error while read --> send OTA_DATA packet
-                    sMeshPacket.type = OTA_Data;
-
-                    if((OTA_MESH_SEGMENT_SIZE * (u32SegmentCounter+1)) >= pBootPartition->size) //check if last segment
-                        {
-                            //last partition image segment --> send OTA_Complete
-                            ESP_LOGI(LOG_TAG, "OTA-TX: last segment--> send Complete");
-                            sMeshPacket.type = OTA_Complete;
-                        }
-
-                    err = errMeshNetworkSendMeshPacket(cpcMeshNodeAddr, &sMeshPacket);
-                }
-            else
-                {
-                    // error while read --> send OTA_ABORT and abort this OTA process
-                    sMeshPacket.type = OTA_Abort;
-                    bAbort = true;
-                    ESP_LOGE(LOG_TAG, "OTA-TX: error while read --> send ABORT");
-                    errMeshNetworkSendMeshPacket(cpcMeshNodeAddr, &sMeshPacket);
-                }
-
-            // loop through all OTA messages or until abort is called or error
-            for (uint32_t u32Index = 0; ((u32Index < QUEUE_MESSAGE_OTA_SIZE) && (bAbort == false) && (err == ESP_OK)); u32Index++) //loop through all OTA messages
-                {
-                    //get OTA message from queue
-                    if (xQueueReceive(queueMessageOTA, &sMeshPacket, ((OTA_MESH_TIMEOUT) / portTICK_PERIOD_MS)) != pdTRUE)
-                        {
-                            ESP_LOGE(LOG_TAG, "Unable to receive OTA Messages from queue");
-                            err = ESP_FAIL;
-                        }
-
-                    //check if from correct node
-                    if((err == ESP_OK) && (bMeshNetworkCheckMacEquality(sMeshPacket.meshSenderAddr.addr, cpcMeshNodeAddr->addr)))
-                        {
-                            //packet from node received --> handle it
-                            switch (sMeshPacket.type)
-                                {
-                                case OTA_ACK: //start next loop for segment
-                                    bNodeIsResponding = true;
-                                    u32Index = QUEUE_MESSAGE_OTA_SIZE; //this will end the loop through all OTA messages
-                                    break;
-                                case OTA_Abort: //abort this OTA process
-                                    bAbort = true;
-                                    bNodeIsResponding = true;
-                                    break;
-                                default:
-                                    ESP_LOGI(LOG_TAG, "OTA-TX: no ACK or ABORT message received");
-                                    break;
-                                }
-                        }
-                }//end OTA message loop
-
-            if(bNodeIsResponding == false)
-                {
-                    //no abort was called but node didn’t responded
-                    ESP_LOGE(LOG_TAG, "OTA-TX: no abort was called but node didn’t responded --> error");
-                    bAbort = true;
-                    err = ESP_FAIL; //this OTA process failed with error
-                }
-            u32SegmentCounter++;
-        }//end of partition segment loop
-    vMeshOtaUtilClearOtaMessageQueue(cpcMeshNodeAddr); //remove all OTA messages from remote node
-    return err;
-}
-
-/**
-* @fn esp_err_t errMeshOtaPartitionAccessMeshReceive(bool* const cpbNewOTAImage, const mesh_addr_t* const cpcMeshNodeAddr)
-* @brief Downloads and writes the image from the remote node
-* @param cpbNewOTAImage pointer to boolean to signal if a new image was successfully received
-* @param cpcMeshNodeAddr pointer to mesh node addr to receive the image segments from
-* @return ESP32 error code
-* @author Hendrik Schutter
-* @date 21.01.2021
-*
-* Receives the images segments from remote node
-* Writtes segments to OTA partition
-* Handles OTA process
-*/
-esp_err_t errMeshOtaPartitionAccessMeshReceive(bool* const cpbNewOTAImage, const mesh_addr_t* const cpcMeshNodeAddr)
-{
-    esp_err_t err = ESP_OK;
-    MESH_PACKET_t sMeshPacket; //packet for sending and receiving
-    bool bComplete = false; //complete the OTA process
-    bool bAbort = false; //abort the OTA process
-    bool bNodeIsResponding = false; //remote node is still active
-    uint32_t u32OTABytesWritten = 0U; //counter unsed for progress log
-    static esp_ota_handle_t otaHandle; //OTA process handle
-    *cpbNewOTAImage = false; //set default to false
-    uint32_t u32SegmentCounter = 0U; //counter of segments unsed for progress log
-
-    ERROR_CHECK(esp_ota_begin(pOTAPartition, OTA_SIZE_UNKNOWN, &otaHandle)); //start ota update process
-
-    //partition segement loop through partition to read in segmensts until end or error or abort called
-    while((bComplete == false) && (err == ESP_OK) && (bAbort == false) && (u32OTABytesWritten <= pOTAPartition->size))
-        {
-            bNodeIsResponding = false; //reset to default
-
-            // loop through all OTA messages or until abort is called
-            for (uint32_t u32Index = 0; ((u32Index < QUEUE_MESSAGE_OTA_SIZE) && (bAbort == false)); u32Index++) //loop through all OTA messages
-                {
-                    //queue not empty
-                    if (xQueueReceive(queueMessageOTA, &sMeshPacket, ((OTA_MESH_TIMEOUT) / portTICK_PERIOD_MS)) != pdTRUE)
-                        {
-                            ESP_LOGE(LOG_TAG, "Unable to receive OTA Messages from queue");
-                            err = ESP_FAIL;
-                        }
-
-                    if((err == ESP_OK) && (bMeshNetworkCheckMacEquality(sMeshPacket.meshSenderAddr.addr, cpcMeshNodeAddr->addr))) //if OTA_Version_Request
-                        {
-                            //packet from node received
-                            switch (sMeshPacket.type)
-                                {
-                                case OTA_Complete: //signal end of this OTA process, fall through because same behavior as OTA_Data
-                                    bComplete = true;
-                                //fall through
-                                case OTA_Data: //data segement received
-                                    bNodeIsResponding = true;
-                                    ERROR_CHECK(esp_ota_write(otaHandle, sMeshPacket.au8Payload, OTA_MESH_SEGMENT_SIZE));
-                                    u32OTABytesWritten = ((u32SegmentCounter+1) * OTA_MESH_SEGMENT_SIZE); //calc bytes that are written in this ota process
-                                    vMeshOtaUtilPrintOtaProgress(&(pOTAPartition->size), &u32OTABytesWritten, Receiver);
-                                    u32Index = QUEUE_MESSAGE_OTA_SIZE; //this will end the loop through all OTA messages
-                                    break;
-                                case OTA_Abort: //abort this OTA process
-                                    ESP_LOGE(LOG_TAG, "OTA-RX: receives abort");
-                                    bAbort = true;
-                                    bNodeIsResponding = true;
-                                    ESP_LOGE(LOG_TAG, "OTA-RX: receives abort --> abort this OTA process on this node");
-                                    //this will end the loop through all OTA messages
-                                    break;
-                                default:
-                                    break;
-                                }
-                        }
-                    else if (err == ESP_OK)
-                        {
-                            //received from wrong node --> back to queue
-                            vMeshOtaUtilAddOtaMessageToQueue(&sMeshPacket);
-                        }
-                }//end of OTA message loop
-
-            if(bNodeIsResponding == false)
-                {
-                    //no abort was called but node didn’t responded --> error
-                    ESP_LOGI(LOG_TAG, "OTA-RX: no abort was called but node didn’t responded --> error");
-                    bAbort = true; //this will stop the partition segement loop
-                    err = ESP_FAIL; //this OTA process failed with error
-                }
-            else
-                {
-                    //node has responded with OTA_DATA or OTA_Complete or OTA_ABORT
-                    if(err == ESP_OK)
-                        {
-
-                            if(bAbort == false)
-                                {
-                                    //no error while ota write --> send OTA_ACK packet
-                                    sMeshPacket.type = OTA_ACK;
-                                    err = errMeshNetworkSendMeshPacket(cpcMeshNodeAddr, &sMeshPacket);
-                                }
-                        }
-                    else
-                        {
-                            // error while read --> send OTA_ABORT and abort this OTA process
-                            sMeshPacket.type = OTA_Abort;
-                            bAbort = true;
-                            ESP_LOGI(LOG_TAG, "OTA-RX: abort --> send ABORT");
-                            errMeshNetworkSendMeshPacket(cpcMeshNodeAddr, &sMeshPacket);
-                        }
-                }
-            u32SegmentCounter++;
-        }//end of partition segement loop
-
-    if(bComplete == true)
-        {
-            //all OTA segments received --> validate
-            ESP_LOGI(LOG_TAG, "OTA-RX: validate image ");
-            ERROR_CHECK(esp_ota_end(otaHandle)); //validate image
-            ERROR_CHECK(esp_ota_set_boot_partition(pOTAPartition));
-            if(err == ESP_OK)
-                {
-                    //successfully updated OTA partition
-                    *cpbNewOTAImage = true;
-                }
-        }
-    else
-        {
-            //not all OTA segments received --> abort this OTA process
-            ERROR_CHECK(esp_ota_abort(otaHandle));
-        }
-    vMeshOtaUtilClearOtaMessageQueue(cpcMeshNodeAddr);
-    return err;
-}
-
--- a/components/mesh_ota/Mesh_OTA_Util.c
+++ b/components/mesh_ota/Mesh_OTA_Util.c
@ -1,466 +0,0 @@
-/**
-* @file Mesh_OTA_Util.c
-* @brief Utility and helper functions to perfrom mesh OTA updates
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-
-#include "Mesh_OTA_Util.h"
-#include "Mesh_OTA_Globals.h"
-
-static const char *LOG_TAG = "mesh_ota";
-
-/**
-* @fn bool bMeshOtaUtilNewerVersion(const char* cpu8Local, const char* cpu8Remote)
-* @brief compares to version strings
-* @param cpu8Local local image version string
-* @param cpu8Remote remote image version string
-* @return bool
-* @author Hendrik Schutter
-* @date 21.01.2021
-*
-* Returns true if remote is newer
-*/
-bool bMeshOtaUtilNewerVersion(const char* cpu8Local, const char* cpu8Remote)
-{
-    char u8LocalTmp[12]; //local version
-    char u8RemoteTmp[12]; //remote version
-    char* pu8saveptrLocal = NULL; //context for strok_r
-    char* pu8saveptrRemote = NULL; //context for strok_r
-    bool bReturn = false; //flag to stop loop
-    uint8_t u8Index = 0; //numbers counter in version string
-
-    strncpy(u8LocalTmp, cpu8Local, 12); //copy in tmp
-    strncpy(u8RemoteTmp, cpu8Remote, 12); //copy in tmp
-
-    char* pu8TokenLocal = strtok_r(u8LocalTmp, ".", &pu8saveptrLocal); //split tokens
-    char* pu8TokenRemote = strtok_r(u8RemoteTmp, ".", &pu8saveptrRemote); //split tokens
-
-    while( (u8Index <= 2) && (bReturn == false)) //loop through tokens
-        {
-            u8Index++;
-            if(atoi(pu8TokenLocal) < atoi(pu8TokenRemote))
-                {
-                    bReturn = true; //version number difference --> stop loop
-                }
-            pu8TokenLocal = strtok_r(NULL, ".", &pu8saveptrLocal); //split tokens
-            pu8TokenRemote = strtok_r(NULL, ".", &pu8saveptrRemote); //split tokens
-        }
-    return bReturn;
-}
-
-/**
-* @fn esp_err_t errMeshOtaUtilExtractVersionNumber(const char* cpu8Data, uint32_t* const cpcu32DataLenght, char* const pc8RemoteVersionNumber)
-* @brief extract version number from image data
-* @param cpu8Data image data buffer
-* @param cpcu32DataLenght pointer to lenght of image data
-* @param pc8RemoteVersionNumber pointer version number
-* @return ESP32 error code
-* @author Hendrik Schutters
-* @date 21.01.2021
-*
-* Search version number in raw image data
-*/
-esp_err_t errMeshOtaUtilExtractVersionNumber(const char* cpu8Data, uint32_t* const cpcu32DataLenght, char* const pc8RemoteVersionNumber)
-{
-    uint32_t u32StartOffset;
-    esp_err_t err = ESP_OK;
-
-    strcpy(pc8RemoteVersionNumber, "999.999.999"); //init value
-    err = errMeshOtaUtilFindImageStart(cpu8Data, cpcu32DataLenght, &u32StartOffset); //get image start offset
-
-    if(err == ESP_OK)
-        {
-            //image found
-            strncpy(pc8RemoteVersionNumber, cpu8Data+(u32StartOffset+48), 11); //copy version number
-            pc8RemoteVersionNumber[12] = '\0';
-        }
-    return err;
-}
-
-/**
-* @fn esp_err_t errMeshOtaUtilFindImageStart(const char* const cpu8Data, const uint32_t* const cpcu32DataLenght, uint32_t* const cpu32StartOffset)
-* @brief find start offset from image raw data
-* @param cpu8Data image data buffer
-* @param cpcu32DataLenght pointer to lenght of image data
-* @param cpu32StartOffset pointer to determined offset
-* @return ESP32 error code
-* @author Hendrik Schutter
-* @date 21.01.2021
-*
-* Search offset in raw image data from server (exclude HTTP response)
-*/
-esp_err_t errMeshOtaUtilFindImageStart(const char* const cpu8Data, const uint32_t* const cpcu32DataLenght, uint32_t* const cpu32StartOffset)
-{
-
-    // Offset   value
-    //   0      = 0xE9 (first byte in image --> magic byte)
-    //  48      = first digit of version number
-
-    esp_err_t errReturn = ESP_OK;
-    bool bImageStartOffsetFound = false;
-    uint32_t u32DataIndex = 0;
-    uint32_t u32FirstDotOffset = 0;
-    uint32_t u32SecondDotOffset = 0;
-    uint8_t u8FirstDotIndex = 0;
-    uint8_t u8SecondDotIndex = 0;
-
-    *cpu32StartOffset = 0U; //reset offset to zero
-
-    while((u32DataIndex < *cpcu32DataLenght) &&  (bImageStartOffsetFound == false))
-        {
-            //search for magic byte
-            if(cpu8Data[u32DataIndex] == 0xe9)
-                {
-                    //magic byte found
-                    while ((u8FirstDotIndex < 3) && (u32FirstDotOffset == 0))
-                        {
-                            //search first dot in version number
-                            if((u32DataIndex+49+u8FirstDotIndex) < *cpcu32DataLenght)
-                                {
-                                    if((cpu8Data[(u32DataIndex+49+u8FirstDotIndex)] == 0x2e))
-                                        {
-                                            //first dot found
-                                            u32FirstDotOffset = (u32DataIndex+49+u8FirstDotIndex);
-                                        }
-                                }
-                            u8FirstDotIndex++;
-                        }
-
-                    while ((u8SecondDotIndex < 3) && (u32SecondDotOffset == 0) && (u32FirstDotOffset != 0))
-                        {
-                            //search first dot in version number
-                            if((u32FirstDotOffset+(u8SecondDotIndex+2)) < *cpcu32DataLenght)
-                                {
-                                    if((cpu8Data[(u32FirstDotOffset+(u8SecondDotIndex+2))] == 0x2e))
-                                        {
-                                            //second dot found
-                                            u32SecondDotOffset = (u32FirstDotOffset+(u8SecondDotIndex+2));
-                                        }
-                                }
-                            u8SecondDotIndex++;
-                        }
-
-                    if((u32FirstDotOffset != 0) && (u32SecondDotOffset != 0))
-                        {
-                            //image start found based on magic byte and version number systax
-                            *cpu32StartOffset = u32DataIndex; //store image start offset
-                            bImageStartOffsetFound = true;
-                        }
-                    else
-                        {
-                            // this is propably not the magic byte --> reset
-                            u32FirstDotOffset = 0;
-                            u32SecondDotOffset = 0;
-                            u8FirstDotIndex = 0;
-                            u8SecondDotIndex = 0;
-                        }
-                }
-            u32DataIndex++;
-        }
-
-    if(bImageStartOffsetFound == false)
-        {
-            errReturn = ESP_ERR_NOT_FOUND;
-        }
-
-    return errReturn;
-}
-
-/**
-* @fn esp_err_t errMeshOtaUtilSendOtaVersionRequest(const mesh_addr_t* const cpcMeshReceiverAddr)
-* @brief send OTA_Version_Request to node
-* @param cpcMeshReceiverAddr node addr
-* @return ESP32 error code
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-esp_err_t errMeshOtaUtilSendOtaVersionRequest(const mesh_addr_t* const cpcMeshReceiverAddr)
-{
-    esp_err_t err = ESP_OK;
-    MESH_PACKET_t packet;
-    packet.type = OTA_Version_Request;
-
-    const esp_partition_t* pBootPartition = NULL; //pointer to boot partition (that will booted after reset)
-    esp_app_desc_t bootPartitionDesc; //Metadata from boot partition
-
-    pBootPartition = esp_ota_get_boot_partition(); //get boot partition (that will booted after reset), not the running partition
-    ERROR_CHECK(esp_ota_get_partition_description(pBootPartition, &bootPartitionDesc)); //get metadate of partition
-    memcpy(&packet.au8Payload, &bootPartitionDesc.version, 12); //copy local version to OTA_Version_Request packet
-    err = errMeshNetworkSendMeshPacket(cpcMeshReceiverAddr, &packet);
-    return err;
-}
-
-/**
-* @fn esp_err_t errMeshOtaUtilSendOtaVersionResponse(const mesh_addr_t* const cpcMeshReceiverAddr)
-* @brief send OTA_Version_Response to node
-* @param cpcMeshReceiverAddr node addr
-* @return ESP32 error code
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-esp_err_t errMeshOtaUtilSendOtaVersionResponse(const mesh_addr_t* const cpcMeshReceiverAddr)
-{
-    esp_err_t err = ESP_OK;
-    MESH_PACKET_t packet;
-    packet.type = OTA_Version_Response;
-
-    const esp_partition_t* pBootPartition = NULL; //pointer to boot partition (that will booted after reset)
-    esp_app_desc_t bootPartitionDesc; //Metadata from boot partition
-
-    pBootPartition = esp_ota_get_boot_partition(); //get boot partition (that will booted after reset), not the running partition
-    ERROR_CHECK(esp_ota_get_partition_description(pBootPartition, &bootPartitionDesc)); //get metadate of partition
-    memcpy(&packet.au8Payload, &bootPartitionDesc.version, 12); //copy local version to OTA_Version_Response packet
-
-    ESP_LOGD(LOG_TAG, "Send OTA_Version_Response to 0x%x", cpcMeshReceiverAddr->addr[5]);
-
-    err = errMeshNetworkSendMeshPacket(cpcMeshReceiverAddr, &packet);
-    return err;
-}
-
-/**
-* @fn void vMeshOtaUtilPrintOtaProgress(const uint32_t* const cpcu32TotalImageSize, const uint32_t* const cpcu32BytesWritten, const OTA_MESH_ROLE_t ceRole)
-* @brief print LOG for OTA process progress
-* @param cpcu32TotalImageSize size of OTA partition
-* @param cpcu32BytesWritten actual bytes written
-* @param ceRole role if this OTA process
-* @return void
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-void vMeshOtaUtilPrintOtaProgress(const uint32_t* const cpcu32TotalImageSize, const uint32_t* const cpcu32BytesWritten, const OTA_MESH_ROLE_t ceRole)
-{
-    uint32_t u32Percentage = 0U;
-    static uint32_t u32LastPercentage = 0U;
-
-    if((*cpcu32BytesWritten) >= (*cpcu32TotalImageSize))
-        {
-            u32Percentage = 100;
-        }
-    else
-        {
-            u32Percentage = (uint32_t) (((float) (*cpcu32BytesWritten)/(float) (*cpcu32TotalImageSize)) * 100.0);
-        }
-
-    if((u32Percentage-u32LastPercentage) >= OTA_PROGRESS_LOG_INTERVAL)
-        {
-            if(ceRole == Transmitter)
-                {
-                    ESP_LOGI(LOG_TAG, "Transmitting OTA update: %i %%", u32Percentage);
-                }
-
-            if(ceRole == Receiver)
-                {
-                    ESP_LOGI(LOG_TAG, "Receiving OTA update: %i %%", u32Percentage);
-                }
-
-
-
-            u32LastPercentage = u32Percentage;
-        }
-}
-
-/**
-* @fn void vMeshOtaUtilAddAllNeighboursToQueue(void)
-* @brief add all neigbhours (children and parent) to queue, except node used in parameter
-* @param const mesh_addr_t* const cpcMeshNodeAddr
-* @return void
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-void vMeshOtaUtilAddAllNeighboursToQueue(const mesh_addr_t* const cpcMeshNodeAddr)
-{
-    esp_err_t err = ESP_OK;
-    mesh_addr_t addrParent;  //addr of parent node
-    mesh_addr_t childrenAddr[CONFIG_MESH_ROUTE_TABLE_SIZE]; //array of children attached to this node
-    uint16_t u16ChildrenSize = 0U; //number of children attached to this node
-
-    err = errMeshNetworkGetParentNode(&addrParent);
-
-    if(err == ESP_OK)
-        {
-            if (cpcMeshNodeAddr != NULL)
-                {
-                    if((bMeshNetworkCheckMacEquality(addrParent.addr, cpcMeshNodeAddr->addr)))
-                        {
-                            //same node --> don't add
-                        }
-                    else
-                        {
-                            vMeshOtaUtilAddNodeToPossibleUpdatableQueue(addrParent.addr);
-                        }
-                }
-            else
-                {
-                    vMeshOtaUtilAddNodeToPossibleUpdatableQueue(addrParent.addr);
-                }
-
-        }
-
-    err = ESP_OK; //reset error code
-
-    ERROR_CHECK(errMeshNetworkGetChildren(childrenAddr, &u16ChildrenSize)); //get all children
-
-    for (uint16_t u16Index = 0; ((u16Index < u16ChildrenSize) && (err == ESP_OK)); u16Index++)
-        {
-            if (cpcMeshNodeAddr != NULL)
-                {
-                    if((bMeshNetworkCheckMacEquality(childrenAddr[u16Index].addr, cpcMeshNodeAddr->addr)))
-                        {
-                            //same node --> don't add
-                        }
-                    else
-                        {
-                            vMeshOtaUtilAddNodeToPossibleUpdatableQueue(childrenAddr[u16Index].addr);
-                        }
-                }
-            else
-                {
-                    vMeshOtaUtilAddNodeToPossibleUpdatableQueue(childrenAddr[u16Index].addr);
-                }
-        }
-}
-
-/**
-* @fn void vMeshOtaUtilClearOtaMessageQueue(const mesh_addr_t* const cpcMeshNodeAddr)
-* @brief remode all OTA messages from this node in queue
-* @param cpcMeshNodeAddr node addr
-* @return void
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-void vMeshOtaUtilClearOtaMessageQueue(const mesh_addr_t* const cpcMeshNodeAddr)
-{
-    MESH_PACKET_t sMeshPacket; //packet for sending and receiving
-    for (uint32_t u32Index = 0; (u32Index < QUEUE_MESSAGE_OTA_SIZE); u32Index++) //loop through all OTA messages
-        {
-            if (xQueueReceive(queueMessageOTA, &sMeshPacket, 0) == pdTRUE)
-                {
-                    if(!(bMeshNetworkCheckMacEquality(sMeshPacket.meshSenderAddr.addr, cpcMeshNodeAddr->addr)))
-                        {
-                            //received OTA message is NOT from cpcMeshNodeAddr --> keep it in queue
-                            vMeshOtaUtilAddOtaMessageToQueue(&sMeshPacket);
-                        }
-                }
-        }//end OTA message loop
-}
-
-/**
-* @fn void vMeshOtaUtilClearNeighboursQueue(const mesh_addr_t* const cpcMeshNodeAddr)
-* @brief remode all instances of this node in queue
-* @param cpcMeshNodeAddr node addr
-* @return void
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-void vMeshOtaUtilClearNeighboursQueue(const mesh_addr_t* const cpcMeshNodeAddr)
-{
-    mesh_addr_t sNode; //packet for sending and receiving
-    for (uint32_t u32Index = 0; (u32Index < QUEUE_NODES_SIZE); u32Index++) //loop through all node queue
-        {
-            if (xQueueReceive(queueNodes, &sNode, 0) == pdTRUE)
-                {
-                    if((bMeshNetworkCheckMacEquality(sNode.addr, cpcMeshNodeAddr->addr)))
-                        {
-                            //same node --> don't add again
-                        }
-                    else
-                        {
-                            //node is NOT cpcMeshNodeAddr --> keep it in queue
-                            vMeshOtaUtilAddNodeToPossibleUpdatableQueue(sNode.addr);
-                        }
-
-                }
-        }//end nodes
-}
-
-/**
-* @fn void vMeshOtaUtilAddNodeToPossibleUpdatableQueue(const uint8_t* const cpcu8MAC)
-* @brief add node instance to queue
-* @param cpcu8MAC MAC addr of node
-* @return void
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-void vMeshOtaUtilAddNodeToPossibleUpdatableQueue(const uint8_t* const cpcu8MAC)
-{
-    //send payload to node queues
-    mesh_addr_t addrNode;
-    memcpy(&addrNode.addr, (uint8_t *)cpcu8MAC, 6); //copy MAC
-
-    if (xQueueSend(queueNodes, &addrNode, portMAX_DELAY) != pdPASS)
-        {
-            ESP_LOGE(LOG_TAG, "Unable to push node into node queue");
-        }
-    else
-        {
-            ESP_LOGD(LOG_TAG, "added node \"%x:%x:%x:%x:%x:%x\" to possible updatable queue", addrNode.addr[0], addrNode.addr[1], addrNode.addr[2], addrNode.addr[3], addrNode.addr[4], addrNode.addr[5]);
-        }
-}
-
-/**
-* @fn void vMeshOtaUtilAddOtaMessageToQueue(const MESH_PACKET_t* const cpcuMeshPacket)
-* @brief add OTA message to queue
-* @param cpcuMeshPacket OTA message
-* @return void
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-void vMeshOtaUtilAddOtaMessageToQueue(const MESH_PACKET_t* const cpcuMeshPacket)
-{
-    //send ota packet to packet queue
-    if (xQueueSend(queueMessageOTA, cpcuMeshPacket, portMAX_DELAY) != pdPASS)
-        {
-            ESP_LOGE(LOG_TAG, "Unable to push ota packet into packet queue");
-        }
-    else
-        {
-            switch (cpcuMeshPacket->type)
-                {
-                case OTA_Abort:
-                    ESP_LOGD(LOG_TAG, "added ota message to queue: OTA_Abort from 0x%x", cpcuMeshPacket->meshSenderAddr.addr[5]);
-                    break;
-                case OTA_Version_Request:
-                    ESP_LOGD(LOG_TAG, "added ota message to queue: OTA_Version_Request from 0x%x", cpcuMeshPacket->meshSenderAddr.addr[5]);
-                    break;
-
-                case OTA_Version_Response:
-                    ESP_LOGD(LOG_TAG, "added ota message to queue: OTA_Version Response from 0x%x", cpcuMeshPacket->meshSenderAddr.addr[5]);
-                    break;
-                default:
-                    break;
-                }
-        }
-}
-
-/**
-* @fn void vMeshOtaUtilChangeStateOfServerWorker(const bool cbState)
-* @brief callback for mesh network if connectivity to server changed
-* @param cbState boolean state
-* @return void
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-void vMeshOtaUtilChangeStateOfServerWorker(const bool cbState)
-{
-    static bool bLastState = false;
-
-    if(cbState != bLastState) //change only if necessary
-        {
-            if(cbState == true)
-                {
-                    if (xSemaphoreGive(bsStartStopServerWorker)  != pdTRUE)
-                        {
-                            ESP_LOGE(LOG_TAG, "Unable to give mutex to activate the server worker");
-                        }
-                }
-            else
-                {
-                    if (xSemaphoreTake(bsStartStopServerWorker,( TickType_t ) 10 )  != pdTRUE)
-                        {
-                            ESP_LOGE(LOG_TAG, "Unable to obtain mutex to deactivate the server worker");
-                        }
-                }
-            bLastState = cbState;
-        }
-}
--- a/components/mesh_ota/component.mk
+++ b/components/mesh_ota/component.mk
--- a/components/mesh_ota/include/HTTPS_Client.h
+++ b/components/mesh_ota/include/HTTPS_Client.h
@ -1,81 +0,0 @@
-/**
-* @file HTTPS_Client.h
-* @brief Used to download the OTA image from the server
-* @author Hendrik Schutter
-* @date 20.01.2021
-*
-* Additional Infos: Connects via HTTPS and HTTPS Basic Auth to the Server.
-* Downloads the image in segments
-*/
-
-#ifndef H_HTTPS_CLIENT
-#define H_HTTPS_CLIENT
-
-#include <string.h>
-#include <stdlib.h>
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "esp_event.h"
-#include "esp_log.h"
-#include "esp_system.h"
-#include "esp_netif.h"
-#include "mbedtls/platform.h"
-#include "mbedtls/net_sockets.h"
-#include "mbedtls/esp_debug.h"
-#include "mbedtls/ssl.h"
-#include "mbedtls/entropy.h"
-#include "mbedtls/ctr_drbg.h"
-#include "mbedtls/error.h"
-#include "mbedtls/certs.h"
-#include "esp_crt_bundle.h"
-
-#ifndef CONFIG_OTA_HTTPS_URL
-#define CONFIG_OTA_HTTPS_URL "https://exmaple.com/theImage.bin"
-#endif
-
-#ifndef CONFIG_OTA_HTTPS_SERVER_PORT
-#define CONFIG_OTA_HTTPS_SERVER_PORT "443"
-#endif
-
-#ifndef CONFIG_OTA_HTTPS_AUTH
-#define CONFIG_OTA_HTTPS_AUTH "base64(user:password)"
-#endif
-
-#ifndef CONFIG_OTA_HTTPS_SERVER_COMMON_NAME
-#define CONFIG_OTA_HTTPS_SERVER_COMMON_NAME "exmaple.com"
-#endif
-
-#define HTTPS_CLIENT_OK 0
-#define HTTPS_CLIENT_ERROR -1
-#define HTTPS_CLIENT_ERROR_INIT_EMBEDTLS -2
-#define HTTPS_CLIENT_ERROR_INIT_CONNECT_TWO_SERVER -3
-#define HTTPS_CLIENT_ERROR_INIT_VALIDATE_SERVER -4
-#define HTTPS_CLIENT_ERROR_INIT_SEND_REQUEST -5
-
-#define HTTPS_READ_TIMEOUT 1000 //ms
-
-struct HTTPS_Client
-{
-    mbedtls_entropy_context entropy;
-    mbedtls_ctr_drbg_context ctr_drbg;
-    mbedtls_ssl_context ssl;
-    mbedtls_x509_crt cacert;
-    mbedtls_ssl_config conf;
-    mbedtls_net_context server_fd;
-};
-
-typedef int32_t https_client_ret_t;
-typedef struct HTTPS_Client HTTPS_Client_t;
-
-https_client_ret_t errHTTPSClientInitialize(void);
-https_client_ret_t errHTTPSClientConnectToServer(void);
-https_client_ret_t errHTTPSClientValidateServer(void);
-https_client_ret_t errHTTPSClientSendRequest(void);
-https_client_ret_t errHTTPSClientRetrieveData(char* const cpu8Data, const uint32_t* const cpcu32DataLenght, uint32_t* pu32BytesRead);
-https_client_ret_t errHTTPSClientReset(void);
-
-#endif /* H_HTTPS_CLIENT */
-
-
-
-
--- a/components/mesh_ota/include/Mesh_Network.h
+++ b/components/mesh_ota/include/Mesh_Network.h
@ -1,120 +0,0 @@
-/**
-* @file Mesh_Network.h
-* @brief Mesh network layer used by OTA and APP
-* @author Hendrik Schutter, init based in ESP32-IDE code
-* @date 20.01.2021
-*
-* Additional Infos: Start network and send and receive data.
-*/
-
-#ifndef H_MESH_NETWORK
-#define H_MESH_NETWORK
-
-#include <string.h>
-#include "esp_wifi.h"
-#include "esp_system.h"
-#include "esp_event.h"
-#include "esp_log.h"
-#include "esp_mesh.h"
-#include "esp_mesh_internal.h"
-#include "nvs_flash.h"
-
-#ifndef CONFIG_MESH_MESSAGE_SIZE
-#define CONFIG_MESH_MESSAGE_SIZE 1500
-#endif
-#ifndef CONFIG_MESH_TOPOLOGY
-#define CONFIG_MESH_TOPOLOGY MESH_TOPO_TREE
-#endif
-#ifndef CONFIG_MESH_MAX_LAYER
-#define CONFIG_MESH_MAX_LAYER 6
-#endif
-#ifndef CONFIG_MESH_ID
-#define CONFIG_MESH_ID "00, 00, 00, 00, 00, 00"
-#endif
-#ifndef CONFIG_MESH_AP_AUTHMODE
-#define CONFIG_MESH_AP_AUTHMODE WIFI_AUTH_WPA2_PSK
-#endif
-#ifndef CONFIG_MESH_AP_CONNECTIONS
-#define CONFIG_MESH_AP_CONNECTIONS 6
-#endif
-#ifndef CONFIG_MESH_AP_PASSWD
-#define CONFIG_MESH_AP_PASSWD "MAP_PASSWD"
-#endif
-#ifndef CONFIG_MESH_CHANNEL
-#define CONFIG_MESH_CHANNEL 0
-#endif
-
-#ifndef CONFIG_MESH_ROUTER_SSID
-#define CONFIG_MESH_ROUTER_SSID "ROUTER_SSID"
-#endif
-
-#ifndef CONFIG_MESH_ROUTER_PASSWD
-#define CONFIG_MESH_ROUTER_PASSWD "ROUTER_PASSWD"
-#endif
-
-#ifndef CONFIG_MESH_ROUTE_TABLE_SIZE
-#define CONFIG_MESH_ROUTE_TABLE_SIZE 50
-#endif
-
-#define MESH_NETWORK_PAYLOAD_SIZE 1024U
-
-struct meshPacket
-{
-    enum otaMeshPacketType
-    {
-        APP_Data,            //data for application
-        OTA_Version_Request, //send own version in payload
-        OTA_Version_Response, //send own version in payload
-        OTA_Data,            //send image segment
-        OTA_ACK,             //ack image segment
-        OTA_Complete,         //signal end of image
-        OTA_Abort             //abort OTA process
-    } type;
-    uint8_t au8Payload[MESH_NETWORK_PAYLOAD_SIZE];
-    mesh_addr_t meshSenderAddr;
-};
-
-typedef struct meshPacket MESH_PACKET_t;
-
-#define ERROR_CHECK(x) if (err == ESP_OK)                                                               \
-    {                                                                                                   \
-        err = (x);                                                                                      \
-        if (err != ESP_OK)                                                                              \
-            {                                                                                           \
-                ESP_LOGE(LOG_TAG,  "%s failed with error: 0x%x -> %s", #x,  err, esp_err_to_name(err)); \
-            }                                                                                           \
-    }                                                                                                   \
-
-extern bool bIsMeshConnected;
-extern int32_t i32MeshLayer;
-extern mesh_addr_t meshParentAddr;
-extern esp_netif_t* pNetifSta;
-extern uint8_t u8ownMAC[6];
-extern void (*pOTAChildConnectHandle)(const uint8_t* const);
-extern void (*pChangeStateOfServerWorkerHandle)(const bool );
-
-esp_err_t errMeshNetworkInitialize(void);
-esp_err_t errMeshNetworkInitializeWiFi(void);
-esp_err_t errMeshNetworkInitializeRouter(mesh_cfg_t* cfg);
-
-esp_err_t errMeshNetworkSetChildConnectedHandle(void (*pChildConnectHandleTmp)(const uint8_t* const cpcu8Data));
-esp_err_t errMeshNetworkSetAppReceiveHandle(void (*pAppRxHandleTmp)(const uint8_t* const cpcu8Data, const uint8_t* const cpcu8Sender));
-esp_err_t errMeshNetworkSetOTAMessageHandleHandle(void (*pOTAMessageHandleTmp)(const MESH_PACKET_t* const cpcuMeshPacket));
-esp_err_t errMeshNetworkSetChangeStateOfServerWorkerHandle(void (*pChangeStateOfServerWorkerHandleTmp)(const bool cbState));
-
-bool bMeshNetworkIsRootNode(void);
-bool bMeshNetworkIsNodeNeighbour(const mesh_addr_t* const cpcNode);
-bool bMeshNetworkCheckMacEquality(const uint8_t* const cpcu8aMAC, const uint8_t* const cpcu8bMAC);
-
-esp_err_t errMeshNetworkStartReceiveTask(void);
-esp_err_t errMeshNetworkGetParentNode(mesh_addr_t* const cpMeshParentAddr);
-esp_err_t errMeshNetworkGetChildren(mesh_addr_t* const cpChildren, uint16_t* const cpu16ChildrenSize);
-esp_err_t errMeshNetworkSendMeshPacket(const mesh_addr_t* const cpcAddrDest, const MESH_PACKET_t* const cpcPacket);
-
-void vMeshNetworkTaskReceiveMeshData(void *arg);
-void vMeshNetworkGetOwnAddr(mesh_addr_t* const cpMeshOwnAddr);
-void vMeshNetworkIpEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventID, void *vpEventData);
-void vMeshNetworkMeshEventHandler(void *arg, esp_event_base_t event_base, int32_t i32EventID, void* vpEventData);
-
-#endif /* H_MESH_NETWORK */
-
--- a/components/mesh_ota/include/Mesh_OTA.h
+++ b/components/mesh_ota/include/Mesh_OTA.h
@ -1,49 +0,0 @@
-/**
-* @file Mesh_OTA.h
-* @brief Start and implement OTA updates via HTTPS from server and other mesh nodes (bidirectional)
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-
-#ifndef H_MESH_OTA
-#define H_MESH_OTA
-
-#include "esp_system.h"
-#include "esp_event.h"
-#include "esp_log.h"
-#include "esp_ota_ops.h"
-#include "esp_partition.h"
-
-#include "Mesh_Network.h"
-#include "HTTPS_Client.h"
-
-#define ERASE_NVS //erase non volatile storage if full
-#define QUEUE_NODES_SIZE 20
-#define QUEUE_MESSAGE_OTA_SIZE 20
-#define SERVER_CHECK_INTERVAL 30 //in seconds
-#define OTA_HTTPS_SEGMENT_SIZE 2048U
-#define OTA_PROGRESS_LOG_INTERVAL 7U
-#define OTA_MESH_SEGMENT_SIZE MESH_NETWORK_PAYLOAD_SIZE
-#define OTA_MESH_TIMEOUT 20000U //in ms
-#define OTA_ALLOW_REBOOT 1
-
-#define ERROR_CHECK(x) if (err == ESP_OK)                                                               \
-    {                                                                                                   \
-        err = (x);                                                                                      \
-        if (err != ESP_OK)                                                                              \
-            {                                                                                           \
-                ESP_LOGE(LOG_TAG,  "%s failed with error: 0x%x -> %s", #x,  err, esp_err_to_name(err)); \
-            }                                                                                           \
-    }                                                                                                   \
-
-esp_err_t errMeshOTAInitialize(void);
-
-//Tasks
-void vMeshOtaTaskServerWorker(void *arg);
-void vMeshOtaTaskOTAWorker(void *arg);
-
-//OTA process endpoints
-esp_err_t errMeshOtaSlaveEndpoint(bool* const cpbNewOTAImage, mesh_addr_t* const cpcMeshNodeAddr);
-esp_err_t errMeshOtaMasterEndpoint(bool* const cpbNewOTAImage, const mesh_addr_t* const cpcMeshNodeAddr);
-
-#endif /* H_MESH_OTA */
--- a/components/mesh_ota/include/Mesh_OTA_Globals.h
+++ b/components/mesh_ota/include/Mesh_OTA_Globals.h
@ -1,27 +0,0 @@
-/**
-* @file Mesh_OTA_Globals.h
-* @brief global variables unsed in Mesh_OTA
-* @author Hendrik Schutter
-* @date 21.01.2021
-*
-*/
-
-#ifndef H_MESH_OTA_GLOBALS
-#define H_MESH_OTA_GLOBALS
-
-#include "esp_system.h"
-#include "esp_partition.h"
-
-#include "Mesh_Network.h"
-#include "HTTPS_Client.h"
-
-extern xQueueHandle queueNodes; //nodes that should be checked for ota update (contains children and parent)
-extern xQueueHandle queueMessageOTA; //mesh ota controll messages like "OTA_Version_Response" "OTA_ACK"
-
-extern SemaphoreHandle_t bsStartStopServerWorker; //binary semaphore
-extern SemaphoreHandle_t bsOTAProcess; //binary semaphore
-
-extern const esp_partition_t* pOTAPartition; //pointer to ota partition
-extern bool bWantReboot; //flag to signal pending reboot
-
-#endif /* H_MESH_OTA_GLOBALS */
--- a/components/mesh_ota/include/Mesh_OTA_Partition_Access.h
+++ b/components/mesh_ota/include/Mesh_OTA_Partition_Access.h
@ -1,37 +0,0 @@
-/**
-* @file Mesh_OTA_Partition_Access.h
-* @brief Write and read partition if requested from Mesh_OTA
-* @author Hendrik Schutter
-* @date 21.01.2021
-*
-* Additional Infos: Write image via HTTPS
-*                   Receive or transmit via Mesh
-*/
-
-#ifndef H_MESH_OTA_PARTITION_ACCESS
-#define H_MESH_OTA_PARTITION_ACCESS
-
-#include "esp_system.h"
-#include "esp_event.h"
-#include "esp_log.h"
-#include "nvs_flash.h"
-#include "esp_ota_ops.h"
-#include "esp_partition.h"
-
-#include "Mesh_Network.h"
-#include "HTTPS_Client.h"
-
-#define ERROR_CHECK(x) if (err == ESP_OK)                                                               \
-    {                                                                                                   \
-        err = (x);                                                                                      \
-        if (err != ESP_OK)                                                                              \
-            {                                                                                           \
-                ESP_LOGE(LOG_TAG,  "%s failed with error: 0x%x -> %s", #x,  err, esp_err_to_name(err)); \
-            }                                                                                           \
-    }                                                                                                   \
-
-esp_err_t errMeshOtaPartitionAccessHttps(bool* const cpbNewOTAImage);
-esp_err_t errMeshOtaPartitionAccessMeshTransmit(const mesh_addr_t* const cpcMeshNodeAddr);
-esp_err_t errMeshOtaPartitionAccessMeshReceive(bool* const cpbNewOTAImage, const mesh_addr_t* const cpcMeshNodeAddr);
-
-#endif /* H_MESH_OTA_PARTITION_ACCESS */
--- a/components/mesh_ota/include/Mesh_OTA_Util.h
+++ b/components/mesh_ota/include/Mesh_OTA_Util.h
@ -1,44 +0,0 @@
-/**
-* @file Mesh_OTA_Util.h
-* @brief Utility and helper functions to perfrom mesh OTA updates
-* @author Hendrik Schutter
-* @date 21.01.2021
-*/
-
-#ifndef H_MESH_OTA_UTIL
-#define H_MESH_OTA_UTIL
-
-#include "esp_system.h"
-#include "esp_event.h"
-#include "esp_log.h"
-
-#include "Mesh_Network.h"
-#include "HTTPS_Client.h"
-#include "Mesh_OTA.h"
-
-enum otaMeshRole
-{
-    Transmitter,
-    Receiver
-};
-
-typedef  enum otaMeshRole OTA_MESH_ROLE_t;
-
-//helper functions
-bool bMeshOtaUtilNewerVersion(const char* cpu8Local, const char* cpu8Remote);
-esp_err_t errMeshOtaUtilExtractVersionNumber(const char* cpu8Data, uint32_t* const cpu32DataLenght, char* const pc8RemoteVersionNumber);
-esp_err_t errMeshOtaUtilFindImageStart(const  char* const cpu8Data, const uint32_t* const cpu32DataLenght, uint32_t* const cpu32StartOffset);
-esp_err_t errMeshOtaUtilSendOtaVersionRequest(const mesh_addr_t* const cpcMeshReceiverAddr);
-esp_err_t errMeshOtaUtilSendOtaVersionResponse(const mesh_addr_t* const cpcMeshReceiverAddr);
-void vMeshOtaUtilPrintOtaProgress(const uint32_t* const cpcu32TotalImageSize, const uint32_t* const cpcu32BytesWritten, const OTA_MESH_ROLE_t ceRole);
-void vMeshOtaUtilAddAllNeighboursToQueue(const mesh_addr_t* const cpcMeshNodeAddr);
-void vMeshOtaUtilClearOtaMessageQueue(const mesh_addr_t* const cpcMeshNodeAddr);
-void vMeshOtaUtilClearNeighboursQueue(const mesh_addr_t* const cpcMeshNodeAddr);
-
-//Handler
-void vMeshOtaUtilAddNodeToPossibleUpdatableQueue(const uint8_t* const cpcu8MAC);
-void vMeshOtaUtilAddOtaMessageToQueue(const MESH_PACKET_t* const cpcuMeshPacket);
-void vMeshOtaUtilChangeStateOfServerWorker(const bool cbState);
-
-#endif /* H_MESH_OTA_UTIL */
-
--- a/components/mesh_ota/test/CMakeLists.txt
+++ b/components/mesh_ota/test/CMakeLists.txt
@ -1,3 +0,0 @@
-idf_component_register(SRC_DIRS "."
-                    INCLUDE_DIRS "."
-                    REQUIRES cmock mesh_ota)
--- a/components/mesh_ota/test/component.mk
+++ b/components/mesh_ota/test/component.mk
@ -1,7 +0,0 @@
-# This is the minimal test component makefile.
-#
-# The following line is needed to force the linker to include all the object
-# files into the application, even if the functions in these object files
-# are not referenced from outside (which is usually the case for unit tests).
-#
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
--- a/components/mesh_ota/test/test_image_hex.h
+++ b/components/mesh_ota/test/test_image_hex.h
@ -1,171 +0,0 @@
-#ifndef H_TEST_IMAGE_HEX
-#define H_TEST_IMAGE_HEX
-
-//with http response +  0.0.1
-char dataWithHttpRespone0_0_1[] = 
-{
-0x48, 0x54, 0x54, 0x50, 0x2f, 0x31, 0x2e, 0x31, 0x20, 0x32, 0x30, 0x30, 0x20, 0x4f, 0x4b, 0xd, 0xa, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x3a, 0x20, 0x6e, 0x67, 0x69, 0x6e, 0x78, 0x2f, 0x31, 0x2e, 0x31, 0x34, 0x2e, 0x32, 0xd, 0xa, 0x44,
-0x61, 0x74, 0x65, 0x3a, 0x20, 0x54, 0x68, 0x75, 0x2c, 0x20, 0x30, 0x37, 0x20, 0x4a, 0x61, 0x6e, 0x20, 0x32, 0x30, 0x32, 0x31, 0x20, 0x31, 0x33, 0x3a, 0x34, 0x38, 0x3a, 0x32, 0x36, 0x20, 0x47, 0x4d, 0x54, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x74,
-0x65, 0x6e, 0x74, 0x2d, 0x54, 0x79, 0x70, 0x65, 0x3a, 0x20, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6f, 0x63, 0x74, 0x65, 0x74, 0x2d, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x74,
-0x65, 0x6e, 0x74, 0x2d, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x3a, 0x20, 0x31, 0x31, 0x31, 0x34, 0x31, 0x30, 0x30, 0xd, 0xa, 0x4c, 0x61, 0x73, 0x74, 0x2d, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x3a, 0x20, 0x53, 0x61, 0x74, 0x2c,
-0x20, 0x30, 0x32, 0x20, 0x4a, 0x61, 0x6e, 0x20, 0x32, 0x30, 0x32, 0x31, 0x20, 0x32, 0x30, 0x3a, 0x34, 0x31, 0x3a, 0x31, 0x31, 0x20, 0x47, 0x4d, 0x54, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x6b,
-0x65, 0x65, 0x70, 0x2d, 0x61, 0x6c, 0x69, 0x76, 0x65, 0xd, 0xa, 0x45, 0x54, 0x61, 0x67, 0x3a, 0x20, 0x22, 0x35, 0x66, 0x66, 0x30, 0x64, 0x61, 0x36, 0x37, 0x2d, 0x31, 0x30, 0x66, 0x66, 0x66, 0x34, 0x22, 0xd, 0xa, 0x53, 0x74, 0x72, 0x69,
-0x63, 0x74, 0x2d, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2d, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x3a, 0x20, 0x6d, 0x61, 0x78, 0x2d, 0x61, 0x67, 0x65, 0x3d, 0x33, 0x31, 0x35, 0x33, 0x36, 0x30, 0x30, 0x30, 0xd,
-0xa, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x2d, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x3a, 0x20, 0x62, 0x79, 0x74, 0x65, 0x73, 0xd, 0xa, 0xd, 0xa, 0xe9, 0x7, 0x2, 0x20, 0x5c, 0x12, 0x8, 0x40, 0xee, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x20, 0x0, 0x40, 0x3f, 0xe4, 0x55, 0x3, 0x0, 0x32, 0x54, 0xcd, 0xab, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x30, 0x2e, 0x30, 0x2e, 0x31, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6d, 0x65, 0x73, 0x68, 0x5f, 0x6f, 0x74, 0x61, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x31, 0x30, 0x3a, 0x32, 0x37, 0x3a, 0x32, 0x31, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4a, 0x61, 0x6e, 0x20, 0x20, 0x32, 0x20, 0x32, 0x30, 0x32, 0x31, 0x0, 0x0, 0x0, 0x0, 0x0, 0x76, 0x34, 0x2e, 0x33, 0x2d, 0x64,
-0x65, 0x76, 0x2d, 0x31, 0x39, 0x30, 0x31, 0x2d, 0x67, 0x31, 0x37, 0x38, 0x62, 0x31, 0x32, 0x32, 0x63, 0x31, 0x2d, 0x64, 0x69, 0x72, 0x74, 0x79, 0x0, 0x0, 0xaa, 0xfc, 0x75, 0xd4, 0x9e, 0xd8, 0x9, 0xc1, 0x11, 0x49, 0x59, 0xa4, 0xbb, 0x16,
-0xb8, 0x74, 0x14, 0xee, 0x2, 0xe7, 0x82, 0xe6, 0x2b, 0x96, 0x19, 0xb7, 0xe8, 0x2f, 0x41, 0x9e, 0x7e, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,0x0, 
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64, 0x29, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20,
-0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x65, 0x20, 0x74, 0x61, 0x73, 0x6b, 0x20, 0x61, 0x72, 0x67, 0x73, 0x21, 0x1b, 0x5b, 0x30, 0x6d, 0xa, 0x0, 0x0, 0x0, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64, 0x29,
-0x20, 0x25, 0x73, 0x3a, 0x20, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x65, 0x20, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x20, 0x64, 0x61, 0x74, 0x61, 0x21, 0x1b, 0x5b, 0x30,
-0x6d, 0xa, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64, 0x29, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x20, 0x74, 0x61,
-0x73, 0x6b, 0x21, 0x1b, 0x5b, 0x30, 0x6d, 0xa, 0x0, 0x0, 0x0, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x20, 0x26, 0x26, 0x20, 0x22, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x74, 0x68, 0x72, 0x65, 0x61,
-0x64, 0x73, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x21, 0x22, 0x0, 0x2f, 0x68, 0x6f, 0x6d, 0x65, 0x2f, 0x68, 0x65, 0x6e, 0x64, 0x72, 0x69, 0x6b, 0x2f, 0x65, 0x73, 0x70, 0x2f, 0x65, 0x73, 0x70, 0x2d, 0x69, 0x64, 0x66, 0x2f, 0x63, 0x6f, 0x6d, 0x70,
-0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x2f, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x2e, 0x63, 0x0, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64, 0x29, 0x20,
-0x25, 0x73, 0x3a, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x21, 0x1b, 0x5b, 0x30, 0x6d, 0xa, 0x0, 0x0, 0x0, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x20, 0x26, 0x26, 0x20, 0x22, 0x46,
-0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x6d, 0x75, 0x74, 0x65, 0x78, 0x21, 0x22, 0x0, 0x0, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x6d, 0x75, 0x74, 0x65, 0x78, 0x5f, 0x75,
-0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x0, 0x0, 0x0, 0x0, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x0, 0x0, 0x74, 0x6c, 0x73, 0x20, 0x21, 0x3d, 0x20, 0x4e, 0x55, 0x4c, 0x4c, 0x0, 0x2f, 0x68, 0x6f, 0x6d,
-0x65, 0x2f, 0x68, 0x65, 0x6e, 0x64, 0x72, 0x69, 0x6b, 0x2f, 0x65, 0x73, 0x70, 0x2f, 0x65, 0x73, 0x70, 0x2d, 0x69, 0x64, 0x66, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74
-};
-
-//without http response +  0.0.1
-char dataWithoutHttpRespone0_0_1[] = 
-{
-0xe9, 0x7, 0x2, 0x20, 0x5c, 0x12, 0x8, 0x40, 0xee, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x20, 0x0, 0x40, 0x3f, 0xe4, 0x55, 0x3, 0x0, 0x32, 0x54, 0xcd, 0xab, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x30, 0x2e, 0x30, 0x2e, 0x31, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6d, 0x65, 0x73, 0x68, 0x5f, 0x6f, 0x74, 0x61, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x31, 0x30, 0x3a, 0x32, 0x37, 0x3a, 0x32, 0x31, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4a, 0x61, 0x6e, 0x20, 0x20, 0x32, 0x20, 0x32, 0x30, 0x32, 0x31, 0x0, 0x0, 0x0, 0x0, 0x0, 0x76, 0x34, 0x2e, 0x33, 0x2d, 0x64,
-0x65, 0x76, 0x2d, 0x31, 0x39, 0x30, 0x31, 0x2d, 0x67, 0x31, 0x37, 0x38, 0x62, 0x31, 0x32, 0x32, 0x63, 0x31, 0x2d, 0x64, 0x69, 0x72, 0x74, 0x79, 0x0, 0x0, 0xaa, 0xfc, 0x75, 0xd4, 0x9e, 0xd8, 0x9, 0xc1, 0x11, 0x49, 0x59, 0xa4, 0xbb, 0x16,
-0xb8, 0x74, 0x14, 0xee, 0x2, 0xe7, 0x82, 0xe6, 0x2b, 0x96, 0x19, 0xb7, 0xe8, 0x2f, 0x41, 0x9e, 0x7e, 0xf5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,0x0, 
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64, 0x29, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20,
-0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x65, 0x20, 0x74, 0x61, 0x73, 0x6b, 0x20, 0x61, 0x72, 0x67, 0x73, 0x21, 0x1b, 0x5b, 0x30, 0x6d, 0xa, 0x0, 0x0, 0x0, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64, 0x29,
-0x20, 0x25, 0x73, 0x3a, 0x20, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x65, 0x20, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x20, 0x64, 0x61, 0x74, 0x61, 0x21, 0x1b, 0x5b, 0x30,
-0x6d, 0xa, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64, 0x29, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x20, 0x74, 0x61,
-0x73, 0x6b, 0x21, 0x1b, 0x5b, 0x30, 0x6d, 0xa, 0x0, 0x0, 0x0, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x20, 0x26, 0x26, 0x20, 0x22, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x74, 0x68, 0x72, 0x65, 0x61,
-0x64, 0x73, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x21, 0x22, 0x0, 0x2f, 0x68, 0x6f, 0x6d, 0x65, 0x2f, 0x68, 0x65, 0x6e, 0x64, 0x72, 0x69, 0x6b, 0x2f, 0x65, 0x73, 0x70, 0x2f, 0x65, 0x73, 0x70, 0x2d, 0x69, 0x64, 0x66, 0x2f, 0x63, 0x6f, 0x6d, 0x70,
-0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x2f, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x2e, 0x63, 0x0, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64, 0x29, 0x20,
-0x25, 0x73, 0x3a, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x21, 0x1b, 0x5b, 0x30, 0x6d, 0xa, 0x0, 0x0, 0x0, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x20, 0x26, 0x26, 0x20, 0x22, 0x46,
-0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x6d, 0x75, 0x74, 0x65, 0x78, 0x21, 0x22, 0x0, 0x0, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x6d, 0x75, 0x74, 0x65, 0x78, 0x5f, 0x75,
-0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x0, 0x0, 0x0, 0x0, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x0, 0x0, 0x74, 0x6c, 0x73, 0x20, 0x21, 0x3d, 0x20, 0x4e, 0x55, 0x4c, 0x4c, 0x0, 0x2f, 0x68, 0x6f, 0x6d,
-0x65, 0x2f, 0x68, 0x65, 0x6e, 0x64, 0x72, 0x69, 0x6b, 0x2f, 0x65, 0x73, 0x70, 0x2f, 0x65, 0x73, 0x70, 0x2d, 0x69, 0x64, 0x66, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74
-};
-    
-//without http response +  9999.999.999
-char dataWithoutHttpRespone999_999_999[] = 
-{
-0xe9, 0x7, 0x2, 0x20, 0x5c, 0x12, 0x8, 0x40, 0xee, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x20, 0x0, 0x40, 0x3f, 0xec, 0x44, 0x3, 0x0, 0x32, 0x54, 0xcd, 0xab, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x39, 0x39, 0x39, 0x2e, 0x39, 0x39, 0x39, 0x2e, 0x39, 0x39, 0x39, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6d, 0x65, 0x73, 0x68, 0x5f, 0x6f, 0x74, 0x61, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x31, 0x34, 0x3a, 0x35, 0x39, 0x3a, 0x33, 0x38, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4a, 0x61, 0x6e, 0x20, 0x20, 0x36, 0x20, 0x32, 0x30, 0x32, 0x31, 0x0, 0x0, 0x0, 0x0, 0x0, 0x76, 0x34, 0x2e, 0x33, 0x2d, 0x64,
-0x65, 0x76, 0x2d, 0x31, 0x39, 0x30, 0x31, 0x2d, 0x67, 0x31, 0x37, 0x38, 0x62, 0x31, 0x32, 0x32, 0x63, 0x31, 0x2d, 0x64, 0x69, 0x72, 0x74, 0x79, 0x0, 0x0, 0x75, 0xf1, 0xa7, 0x5d, 0x78, 0xac, 0xe3, 0x63, 0x3f, 0x1a, 0x81, 0x90, 0x34, 0x2c,
-0xf7, 0xb3, 0x33, 0x63, 0xa4, 0x7c, 0x1e, 0x98, 0xf6, 0x74, 0xd0, 0xcf, 0xdc, 0x51, 0x68, 0x15, 0xcd, 0x61, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64, 0x29, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f,
-0x20, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x65, 0x20, 0x74, 0x61, 0x73, 0x6b, 0x20, 0x61, 0x72, 0x67, 0x73, 0x21, 0x1b, 0x5b, 0x30, 0x6d, 0xa, 0x0, 0x0, 0x0, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64,
-0x29, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x65, 0x20, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x20, 0x64, 0x61, 0x74, 0x61, 0x21, 0x1b, 0x5b, 
-0x30, 0x6d, 0xa, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64, 0x29, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x20, 0x74,
-0x61, 0x73, 0x6b, 0x21, 0x1b, 0x5b, 0x30, 0x6d, 0xa, 0x0, 0x0, 0x0, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x20, 0x26, 0x26, 0x20, 0x22, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x74, 0x68, 0x72,
-0x65, 0x61, 0x64, 0x73, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x21, 0x22, 0x0, 0x2f, 0x68, 0x6f, 0x6d, 0x65, 0x2f, 0x68, 0x65, 0x6e, 0x64, 0x72, 0x69, 0x6b, 0x2f, 0x65, 0x73, 0x70, 0x2f, 0x65, 0x73, 0x70, 0x2d, 0x69, 0x64, 0x66, 0x2f, 0x63, 0x6f,
-0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x2f, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x2e, 0x63, 0x0, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64,
-0x29, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x21, 0x1b, 0x5b, 0x30, 0x6d, 0xa, 0x0, 0x0, 0x0, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x20, 0x26, 0x26,
-0x20, 0x22, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x6d, 0x75, 0x74, 0x65, 0x78, 0x21, 0x22, 0x0, 0x0, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x6d, 0x75, 0x74, 0x65,
-0x78, 0x5f, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x0, 0x0, 0x0, 0x0, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x0, 0x0, 0x74, 0x6c, 0x73, 0x20, 0x21, 0x3d, 0x20, 0x4e, 0x55, 0x4c, 0x4c, 0x0, 0x2f,
-0x68, 0x6f, 0x6d, 0x65, 0x2f, 0x68, 0x65, 0x6e, 0x64, 0x72, 0x69, 0x6b, 0x2f, 0x65, 0x73, 0x70, 0x2f, 0x65, 0x73, 0x70, 0x2d, 0x69, 0x64, 0x66, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74,
-    
-};
-
-//with http response +  999.999.999
-char dataWithHttpRespone999_999_999[] = 
-{
-0x48, 0x54, 0x54, 0x50, 0x2f, 0x31, 0x2e, 0x31, 0x20, 0x32, 0x30, 0x30, 0x20, 0x4f, 0x4b, 0xd, 0xa, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x3a, 0x20, 0x6e, 0x67, 0x69, 0x6e, 0x78, 0x2f, 0x31, 0x2e, 0x31, 0x34, 0x2e, 0x32, 0xd, 0xa, 0x44,
-0x61, 0x74, 0x65, 0x3a, 0x20, 0x54, 0x68, 0x75, 0x2c, 0x20, 0x30, 0x37, 0x20, 0x4a, 0x61, 0x6e, 0x20, 0x32, 0x30, 0x32, 0x31, 0x20, 0x31, 0x35, 0x3a, 0x31, 0x33, 0x3a, 0x32, 0x39, 0x20, 0x47, 0x4d, 0x54, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x74,
-0x65, 0x6e, 0x74, 0x2d, 0x54, 0x79, 0x70, 0x65, 0x3a, 0x20, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6f, 0x63, 0x74, 0x65, 0x74, 0x2d, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x74,
-0x65, 0x6e, 0x74, 0x2d, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x3a, 0x20, 0x31, 0x31, 0x31, 0x34, 0x31, 0x30, 0x30, 0xd, 0xa, 0x4c, 0x61, 0x73, 0x74, 0x2d, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x3a, 0x20, 0x57, 0x65, 0x64, 0x2c,
-0x20, 0x30, 0x36, 0x20, 0x4a, 0x61, 0x6e, 0x20, 0x32, 0x30, 0x32, 0x31, 0x20, 0x31, 0x33, 0x3a, 0x35, 0x39, 0x3a, 0x35, 0x33, 0x20, 0x47, 0x4d, 0x54, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x6b,
-0x65, 0x65, 0x70, 0x2d, 0x61, 0x6c, 0x69, 0x76, 0x65, 0xd, 0xa, 0x45, 0x54, 0x61, 0x67, 0x3a, 0x20, 0x22, 0x35, 0x66, 0x66, 0x35, 0x63, 0x32, 0x35, 0x39, 0x2d, 0x31, 0x30, 0x66, 0x66, 0x66, 0x34, 0x22, 0xd, 0xa, 0x53, 0x74, 0x72, 0x69,
-0x63, 0x74, 0x2d, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2d, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x3a, 0x20, 0x6d, 0x61, 0x78, 0x2d, 0x61, 0x67, 0x65, 0x3d, 0x33, 0x31, 0x35, 0x33, 0x36, 0x30, 0x30, 0x30, 0xd,
-0xa, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x2d, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x3a, 0x20, 0x62, 0x79, 0x74, 0x65, 0x73, 0xd, 0xa, 0xd, 0xa, 0xe9, 0x7, 0x2, 0x20, 0x5c, 0x12, 0x8, 0x40, 0xee, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x20, 0x0, 0x40, 0x3f, 0xec, 0x44, 0x3, 0x0, 0x32, 0x54, 0xcd, 0xab, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x39, 0x39, 0x39, 0x2e, 0x39, 0x39, 0x39, 0x2e, 0x39, 0x39, 0x39, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6d, 0x65, 0x73, 0x68, 0x5f, 0x6f, 0x74, 0x61, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x31, 0x34, 0x3a, 0x35, 0x39, 0x3a, 0x33, 0x38, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4a, 0x61, 0x6e, 0x20, 0x20, 0x36, 0x20, 0x32, 0x30, 0x32, 0x31, 0x0, 0x0, 0x0, 0x0, 0x0, 0x76, 0x34, 0x2e, 0x33, 0x2d, 0x64,
-0x65, 0x76, 0x2d, 0x31, 0x39, 0x30, 0x31, 0x2d, 0x67, 0x31, 0x37, 0x38, 0x62, 0x31, 0x32, 0x32, 0x63, 0x31, 0x2d, 0x64, 0x69, 0x72, 0x74, 0x79, 0x0, 0x0, 0x75, 0xf1, 0xa7, 0x5d, 0x78, 0xac, 0xe3, 0x63, 0x3f, 0x1a, 0x81, 0x90, 0x34, 0x2c,
-0xf7, 0xb3, 0x33, 0x63, 0xa4, 0x7c, 0x1e, 0x98, 0xf6, 0x74, 0xd0, 0xcf, 0xdc, 0x51, 0x68, 0x15, 0xcd, 0x61, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64, 0x29, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f,
-0x20, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x65, 0x20, 0x74, 0x61, 0x73, 0x6b, 0x20, 0x61, 0x72, 0x67, 0x73, 0x21, 0x1b, 0x5b, 0x30, 0x6d, 0xa, 0x0, 0x0, 0x0, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64,
-0x29, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x65, 0x20, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x20, 0x64, 0x61, 0x74, 0x61, 0x21, 0x1b, 0x5b, 
-0x30, 0x6d, 0xa, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64, 0x29, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x20, 0x74,
-0x61, 0x73, 0x6b, 0x21, 0x1b, 0x5b, 0x30, 0x6d, 0xa, 0x0, 0x0, 0x0, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x20, 0x26, 0x26, 0x20, 0x22, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x74, 0x68, 0x72,
-0x65, 0x61, 0x64, 0x73, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x21, 0x22, 0x0, 0x2f, 0x68, 0x6f, 0x6d, 0x65, 0x2f, 0x68, 0x65, 0x6e, 0x64, 0x72, 0x69, 0x6b, 0x2f, 0x65, 0x73, 0x70, 0x2f, 0x65, 0x73, 0x70, 0x2d, 0x69, 0x64, 0x66, 0x2f, 0x63, 0x6f,
-0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x2f, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x2e, 0x63, 0x0, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64,
-0x29, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x21, 0x1b, 0x5b, 0x30, 0x6d, 0xa, 0x0, 0x0, 0x0, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x20, 0x26, 0x26,
-0x20, 0x22, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x6d, 0x75, 0x74, 0x65, 0x78, 0x21, 0x22, 0x0, 0x0, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x6d, 0x75, 0x74, 0x65,
-0x78, 0x5f, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x0, 0x0, 0x0, 0x0, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x0, 0x0, 0x74, 0x6c, 0x73, 0x20, 0x21, 0x3d, 0x20, 0x4e, 0x55, 0x4c, 0x4c, 0x0, 0x2f,
-0x68, 0x6f, 0x6d, 0x65, 0x2f, 0x68, 0x65, 0x6e, 0x64, 0x72, 0x69, 0x6b, 0x2f, 0x65, 0x73, 0x70, 0x2f, 0x65, 0x73, 0x70, 0x2d, 0x69, 0x64, 0x66, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74,
-};
-
-//with http response +  999.9.999
-char dataWithHttpRespone999_9_999[] = 
-{
-0x48, 0x54, 0x54, 0x50, 0x2f, 0x31, 0x2e, 0x31, 0x20, 0x32, 0x30, 0x30, 0x20, 0x4f, 0x4b, 0xd, 0xa, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x3a, 0x20, 0x6e, 0x67, 0x69, 0x6e, 0x78, 0x2f, 0x31, 0x2e, 0x31, 0x34, 0x2e, 0x32, 0xd, 0xa, 0x44,
-0x61, 0x74, 0x65, 0x3a, 0x20, 0x54, 0x68, 0x75, 0x2c, 0x20, 0x30, 0x37, 0x20, 0x4a, 0x61, 0x6e, 0x20, 0x32, 0x30, 0x32, 0x31, 0x20, 0x31, 0x35, 0x3a, 0x31, 0x33, 0x3a, 0x32, 0x39, 0x20, 0x47, 0x4d, 0x54, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x74,
-0x65, 0x6e, 0x74, 0x2d, 0x54, 0x79, 0x70, 0x65, 0x3a, 0x20, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6f, 0x63, 0x74, 0x65, 0x74, 0x2d, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x74,
-0x65, 0x6e, 0x74, 0x2d, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x3a, 0x20, 0x34, 0x31, 0x30, 0x30, 0xd, 0xa, 0x4c, 0x61, 0x73, 0x74, 0x2d, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x3a, 0x20, 0x57, 0x65, 0x64, 0x2c,
-0x20, 0x30, 0x36, 0x20, 0x4a, 0x61, 0x6e, 0x20, 0x32, 0x30, 0x32, 0x31, 0x20, 0x31, 0x33, 0x3a, 0x35, 0x39, 0x3a, 0x35, 0x33, 0x20, 0x47, 0x4d, 0x54, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x6b,
-0x65, 0x65, 0x70, 0x2d, 0x61, 0x6c, 0x69, 0x76, 0x65, 0xd, 0xa, 0x45, 0x54, 0x61, 0x67, 0x3a, 0x20, 0x22, 0x35, 0x66, 0x66, 0x35, 0x63, 0x32, 0x35, 0x39, 0x2d, 0x31, 0x30, 0x66, 0x66, 0x66, 0x34, 0x22, 0xd, 0xa, 0x53, 0x74, 0x72, 0x69,
-0x63, 0x74, 0x2d, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2d, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x3a, 0x20, 0x6d, 0x61, 0x78, 0x2d, 0x61, 0x67, 0x65, 0x3d, 0x33, 0x31, 0x35, 0x33, 0x36, 0x30, 0x30, 0x30, 0xd,
-0xa, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x2d, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x3a, 0x20, 0x62, 0x79, 0x74, 0x65, 0x73, 0xd, 0xa, 0xd, 0xa, 0xe9, 0x7, 0x2, 0x20, 0x5c, 0x12, 0x8, 0x40, 0xee, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x20, 0x0, 0x40, 0x3f, 0xec, 0x44, 0x3, 0x0, 0x32, 0x54, 0xcd, 0xab, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x39, 0x39, 0x39, 0x2e, 0x39, 0x2e, 0x39, 0x39, 0x39, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6d, 0x65, 0x73, 0x68, 0x5f, 0x6f, 0x74, 0x61, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x31, 0x34, 0x3a, 0x35, 0x39, 0x3a, 0x33, 0x38, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4a, 0x61, 0x6e, 0x20, 0x20, 0x36, 0x20, 0x32, 0x30, 0x32, 0x31, 0x0, 0x0, 0x0, 0x0, 0x0, 0x76, 0x34, 0x2e, 0x33, 0x2d, 0x64,
-0x65, 0x76, 0x2d, 0x31, 0x39, 0x30, 0x31, 0x2d, 0x67, 0x31, 0x37, 0x38, 0x62, 0x31, 0x32, 0x32, 0x63, 0x31, 0x2d, 0x64, 0x69, 0x72, 0x74, 0x79, 0x0, 0x0, 0x75, 0xf1, 0xa7, 0x5d, 0x78, 0xac, 0xe3, 0x63, 0x3f, 0x1a, 0x81, 0x90, 0x34, 0x2c,
-0xf7, 0xb3, 0x33, 0x63, 0xa4, 0x7c, 0x1e, 0x98, 0xf6, 0x74, 0xd0, 0xcf, 0xdc, 0x51, 0x68, 0x15, 0xcd, 0x61, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64, 0x29, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f,
-0x20, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x65, 0x20, 0x74, 0x61, 0x73, 0x6b, 0x20, 0x61, 0x72, 0x67, 0x73, 0x21, 0x1b, 0x5b, 0x30, 0x6d, 0xa, 0x0, 0x0, 0x0, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64,
-0x29, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x65, 0x20, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x20, 0x64, 0x61, 0x74, 0x61, 0x21, 0x1b, 0x5b, 
-0x30, 0x6d, 0xa, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64, 0x29, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x20, 0x74,
-0x61, 0x73, 0x6b, 0x21, 0x1b, 0x5b, 0x30, 0x6d, 0xa, 0x0, 0x0, 0x0, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x20, 0x26, 0x26, 0x20, 0x22, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x74, 0x68, 0x72,
-0x65, 0x61, 0x64, 0x73, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x21, 0x22, 0x0, 0x2f, 0x68, 0x6f, 0x6d, 0x65, 0x2f, 0x68, 0x65, 0x6e, 0x64, 0x72, 0x69, 0x6b, 0x2f, 0x65, 0x73, 0x70, 0x2f, 0x65, 0x73, 0x70, 0x2d, 0x69, 0x64, 0x66, 0x2f, 0x63, 0x6f,
-0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x2f, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x2e, 0x63, 0x0, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64,
-0x29, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x21, 0x1b, 0x5b, 0x30, 0x6d, 0xa, 0x0, 0x0, 0x0, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x20, 0x26, 0x26,
-0x20, 0x22, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x6d, 0x75, 0x74, 0x65, 0x78, 0x21, 0x22, 0x0, 0x0, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x6d, 0x75, 0x74, 0x65,
-0x78, 0x5f, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x0, 0x0, 0x0, 0x0, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x0, 0x0, 0x74, 0x6c, 0x73, 0x20, 0x21, 0x3d, 0x20, 0x4e, 0x55, 0x4c, 0x4c, 0x0, 0x2f,
-0x68, 0x6f, 0x6d, 0x65, 0x2f, 0x68, 0x65, 0x6e, 0x64, 0x72, 0x69, 0x6b, 0x2f, 0x65, 0x73, 0x70, 0x2f, 0x65, 0x73, 0x70, 0x2d, 0x69, 0x64, 0x66, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74,
-};
-
-//with http response +  999.99.999
-char dataWithHttpRespone999_99_999[] = 
-{
-0x48, 0x54, 0x54, 0x50, 0x2f, 0x31, 0x2e, 0x31, 0x20, 0x32, 0x30, 0x30, 0x20, 0x4f, 0x4b, 0xd, 0xa, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x3a, 0x20, 0x6e, 0x67, 0x69, 0x6e, 0x78, 0x2f, 0x31, 0x2e, 0x31, 0x34, 0x2e, 0x32, 0xd, 0xa, 0x44,
-0x61, 0x74, 0x65, 0x3a, 0x20, 0x54, 0x68, 0x75, 0x2c, 0x20, 0x30, 0x37, 0x20, 0x4a, 0x61, 0x6e, 0x20, 0x32, 0x30, 0x32, 0x31, 0x20, 0x31, 0x35, 0x3a, 0x31, 0x33, 0x3a, 0x32, 0x39, 0x20, 0x47, 0x4d, 0x54, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x74,
-0x65, 0x6e, 0x74, 0x2d, 0x54, 0x79, 0x70, 0x65, 0x3a, 0x20, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6f, 0x63, 0x74, 0x65, 0x74, 0x2d, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x74,
-0x65, 0x6e, 0x74, 0x2d, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x3a, 0x20, 0x31, 0x31, 0x31, 0x34, 0x31, 0x30, 0x30, 0xd, 0xa, 0x4c, 0x61, 0x73, 0x74, 0x2d, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x3a, 0x20, 0x57, 0x65, 0x64, 0x2c,
-0x20, 0x30, 0x36, 0x20, 0x4a, 0x61, 0x6e, 0x20, 0x32, 0x30, 0x32, 0x31, 0x20, 0x31, 0x33, 0x3a, 0x35, 0x39, 0x3a, 0x35, 0x33, 0x20, 0x47, 0x4d, 0x54, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x6b,
-0x65, 0x65, 0x70, 0x2d, 0x61, 0x6c, 0x69, 0x76, 0x65, 0xd, 0xa, 0x45, 0x54, 0x61, 0x67, 0x3a, 0x20, 0x22, 0x35, 0x66, 0x66, 0x35, 0x63, 0x32, 0x35, 0x39, 0x2d, 0x31, 0x30, 0x66, 0x66, 0x66, 0x34, 0x22, 0xd, 0xa, 0x53, 0x74, 0x72, 0x69,
-0x63, 0x74, 0x2d, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2d, 0x53, 0x65, 0x63, 0x75, 0x72, 0x61, 0x78, 0x2d, 0x61, 0x67, 0x65, 0x3d, 0x33, 0x31, 0x35, 0x33, 0x36, 0x30, 0x30, 0x30, 0xd,
-0xa, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x2d, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x3a, 0x20, 0x62, 0x79, 0x74, 0x65, 0x73, 0xd, 0xa, 0xd, 0xa, 0xe9, 0x7, 0x2, 0x20, 0x5c, 0x12, 0x8, 0x40, 0xee, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x20, 0x0, 0x40, 0x3f, 0xec, 0x44, 0x3, 0x0, 0x32, 0x54, 0xcd, 0xab, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x39, 0x39, 0x39, 0x2e, 0x39, 0x39, 0x2e, 0x39, 0x39, 0x39, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x6d, 0x65, 0x73, 0x68, 0x5f, 0x6f, 0x74, 0x61, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x31, 0x34, 0x3a, 0x35, 0x39, 0x3a, 0x33, 0x38, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4a, 0x61, 0x6e, 0x20, 0x20, 0x36, 0x20, 0x32, 0x30, 0x32, 0x31, 0x0, 0x0, 0x0, 0x0, 0x0, 0x76, 0x34, 0x2e, 0x33, 0x2d, 0x64,
-0x65, 0x76, 0x2d, 0x31, 0x39, 0x30, 0x31, 0x2d, 0x67, 0x31, 0x37, 0x38, 0x62, 0x31, 0x32, 0x32, 0x63, 0x31, 0x2d, 0x64, 0x69, 0x72, 0x74, 0x79, 0x0, 0x0, 0x75, 0xf1, 0xa7, 0x5d, 0x78, 0xac, 0xe3, 0x63, 0x3f, 0x1a, 0x81, 0x90, 0x34, 0x2c,
-0xf7, 0xb3, 0x33, 0x63, 0xa4, 0x7c, 0x1e, 0x98, 0xf6, 0x74, 0xd0, 0xcf, 0xdc, 0x51, 0x68, 0x15, 0xcd, 0x61, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64, 0x29, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f,
-0x20, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x65, 0x20, 0x74, 0x61, 0x73, 0x6b, 0x20, 0x61, 0x72, 0x67, 0x73, 0x21, 0x1b, 0x5b, 0x30, 0x6d, 0xa, 0x0, 0x0, 0x0, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64,
-0x29, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x65, 0x20, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x20, 0x64, 0x61, 0x74, 0x61, 0x21, 0x1b, 0x5b, 
-0x30, 0x6d, 0xa, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64, 0x29, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x20, 0x74,
-0x61, 0x73, 0x6b, 0x21, 0x1b, 0x5b, 0x30, 0x6d, 0xa, 0x0, 0x0, 0x0, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x20, 0x26, 0x26, 0x20, 0x22, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x74, 0x68, 0x72,
-0x65, 0x61, 0x64, 0x73, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x21, 0x22, 0x0, 0x2f, 0x68, 0x6f, 0x6d, 0x65, 0x2f, 0x68, 0x65, 0x6e, 0x64, 0x72, 0x69, 0x6b, 0x2f, 0x65, 0x73, 0x70, 0x2f, 0x65, 0x73, 0x70, 0x2d, 0x69, 0x64, 0x66, 0x2f, 0x63, 0x6f,
-0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x2f, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x2e, 0x63, 0x0, 0x0, 0x1b, 0x5b, 0x30, 0x3b, 0x33, 0x31, 0x6d, 0x45, 0x20, 0x28, 0x25, 0x64,
-0x29, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x25, 0x73, 0x3a, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x21, 0x1b, 0x5b, 0x30, 0x6d, 0xa, 0x0, 0x0, 0x0, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x20, 0x26, 0x26,
-0x20, 0x22, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x6d, 0x75, 0x74, 0x65, 0x78, 0x21, 0x22, 0x0, 0x0, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x6d, 0x75, 0x74, 0x65,
-0x78, 0x5f, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x0, 0x0, 0x0, 0x0, 0x70, 0x74, 0x68, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x0, 0x0, 0x74, 0x6c, 0x73, 0x20, 0x21, 0x3d, 0x20, 0x4e, 0x55, 0x4c, 0x4c, 0x0, 0x2f,
-0x68, 0x6f, 0x6d, 0x65, 0x2f, 0x68, 0x65, 0x6e, 0x64, 0x72, 0x69, 0x6b, 0x2f, 0x65, 0x73, 0x70, 0x2f, 0x65, 0x73, 0x70, 0x2d, 0x69, 0x64, 0x66, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74,
-};
- 
-#endif /* H_TEST_IMAGE_HEX */
--- a/components/mesh_ota/test/test_mesh_ota.c
+++ b/components/mesh_ota/test/test_mesh_ota.c
@ -1,282 +0,0 @@
-#include <limits.h>
-#include "unity.h"
-
-#include "Mesh_OTA_Util.h"
-#include "test_image_hex.h"
-#include "Mesh_Network.h"
-
-// ### ### ###  distinguish newer image version ### ### ###
-
-TEST_CASE("Remote got patch", "[distinguish newer image version]")
-{
-    char versionLocal[] = "1.2.3";  //current running image
-    char versionRemote[] = "1.2.4"; //image from server
-    TEST_ASSERT_TRUE( bMeshOtaUtilNewerVersion(versionLocal, versionRemote)  );
-}
-
-TEST_CASE("Remote got minor", "[distinguish newer image version]")
-{
-    char versionLocal[] = "1.2.3";  //current running image
-    char versionRemote[] = "1.3.3"; //image from server
-    TEST_ASSERT_TRUE( bMeshOtaUtilNewerVersion(versionLocal, versionRemote)  );
-}
-
-TEST_CASE("Remote got major", "[distinguish newer image version]")
-{
-    char versionLocal[] = "1.2.3";  //current running image
-    char versionRemote[] = "2.2.3"; //image from server
-    TEST_ASSERT_TRUE( bMeshOtaUtilNewerVersion(versionLocal, versionRemote)  );
-}
-
-TEST_CASE("Local got patch", "[distinguish newer image version]")
-{
-    char versionLocal[] = "1.2.4";  //current running image
-    char versionRemote[] = "1.2.3"; //image from server
-    TEST_ASSERT_FALSE( bMeshOtaUtilNewerVersion(versionLocal, versionRemote)  );
-}
-
-TEST_CASE("Local got minor", "[distinguish newer image version]")
-{
-    char versionLocal[] = "1.3.3";  //current running image
-    char versionRemote[] = "1.2.3"; //image from server
-    TEST_ASSERT_FALSE( bMeshOtaUtilNewerVersion(versionLocal, versionRemote)  );
-}
-
-TEST_CASE("Local got major", "[distinguish newer image version]")
-{
-    char versionLocal[] = "2.2.3";  //current running image
-    char versionRemote[] = "1.2.3"; //image from server
-    TEST_ASSERT_FALSE( bMeshOtaUtilNewerVersion(versionLocal, versionRemote)  );
-}
-
-TEST_CASE("Remote got alpha and patch", "[distinguish newer image version]")
-{
-    char versionLocal[] = "2.2.3";  //current running image
-    char versionRemote[] = "a2.2.4"; //image from server
-    TEST_ASSERT_TRUE( bMeshOtaUtilNewerVersion(versionLocal, versionRemote)  );
-}
-
-TEST_CASE("Remote got max", "[distinguish newer image version]")
-{
-    char versionLocal[] = "2.2.3";  //current running image
-    char versionRemote[] = "999.999.999"; //image from server
-    TEST_ASSERT_TRUE( bMeshOtaUtilNewerVersion(versionLocal, versionRemote)  );
-}
-
-// ### ### ###  find start offset in firmware image ### ### ###
-
-TEST_CASE("with http response +  0.0.1", "[find start offset in firmware image]")
-{
-    uint32_t u32StartOffset;
-    uint32_t u32DataLenght = sizeof(dataWithHttpRespone0_0_1)/sizeof(dataWithHttpRespone0_0_1[0]);
-    esp_err_t err = errMeshOtaUtilFindImageStart(dataWithHttpRespone0_0_1, &u32DataLenght, &u32StartOffset);
-    if(err == ESP_OK)
-    {
-        TEST_ASSERT_EQUAL_INT(305, u32StartOffset);
-    }
-    else
-    {
-        TEST_ASSERT_EQUAL_INT(ESP_OK, err);
-    }
-}
-
-TEST_CASE("without http response +  0.0.1", "[find start offset in firmware image]")
-{
-    uint32_t u32StartOffset;
-    uint32_t u32DataLenght = sizeof(dataWithoutHttpRespone0_0_1)/sizeof(dataWithoutHttpRespone0_0_1[0]);
-    esp_err_t err =  errMeshOtaUtilFindImageStart(dataWithoutHttpRespone0_0_1, &u32DataLenght, &u32StartOffset);
-    if(err == ESP_OK)
-    {
-        TEST_ASSERT_EQUAL_INT(0, u32StartOffset);
-    }
-    else
-    {
-        TEST_ASSERT_EQUAL_INT(ESP_OK, err);
-    }
-}
-
-
-TEST_CASE("with http response +  999.999.999", "[find start offset in firmware image]")
-{
-    uint32_t u32StartOffset;
-    uint32_t u32DataLenght = sizeof(dataWithHttpRespone999_999_999)/sizeof(dataWithHttpRespone999_999_999[0]);
-    esp_err_t err = errMeshOtaUtilFindImageStart(dataWithHttpRespone999_999_999, &u32DataLenght, &u32StartOffset);
-    if(err == ESP_OK)
-    {
-        TEST_ASSERT_EQUAL_INT(305, u32StartOffset);
-    }
-    else
-    {
-        TEST_ASSERT_EQUAL_INT(ESP_OK, err);
-    }
-}
-
-TEST_CASE("without http response +  999.999.999", "[find start offset in firmware image]")
-{
-    uint32_t u32StartOffset;
-    uint32_t u32DataLenght = sizeof(dataWithoutHttpRespone999_999_999)/sizeof(dataWithoutHttpRespone999_999_999[0]);
-    esp_err_t err = errMeshOtaUtilFindImageStart(dataWithoutHttpRespone999_999_999, &u32DataLenght, &u32StartOffset);
-    if(err == ESP_OK)
-    {
-        TEST_ASSERT_EQUAL_INT(0, u32StartOffset);
-    }
-    else
-    {
-        TEST_ASSERT_EQUAL_INT(ESP_OK, err);
-    }
-}
-
-TEST_CASE("with http response +  999.9.999", "[find start offset in firmware image]")
-{
-    uint32_t u32StartOffset;
-    uint32_t u32DataLenght = sizeof(dataWithHttpRespone999_9_999)/sizeof(dataWithHttpRespone999_9_999[0]);
-    esp_err_t err = errMeshOtaUtilFindImageStart(dataWithHttpRespone999_9_999, &u32DataLenght, &u32StartOffset);
-    if(err == ESP_OK)
-    {
-        TEST_ASSERT_EQUAL_INT(302, u32StartOffset);
-    }
-    else
-    {
-        TEST_ASSERT_EQUAL_INT(ESP_OK, err);
-    }
-}
-
-TEST_CASE("with http response +  999.99.999", "[find start offset in firmware image]")
-{
-    uint32_t u32StartOffset;
-    uint32_t u32DataLenght = sizeof(dataWithHttpRespone999_99_999)/sizeof(dataWithHttpRespone999_99_999[0]);
-    esp_err_t err = errMeshOtaUtilFindImageStart(dataWithHttpRespone999_99_999, &u32DataLenght, &u32StartOffset);
-    if(err == ESP_OK)
-    {
-        TEST_ASSERT_EQUAL_INT(299, u32StartOffset);
-    }
-    else
-    {
-        TEST_ASSERT_EQUAL_INT(ESP_OK, err);
-    }
-}
-
-// ### ### ###  distinguish newer image version ### ### ###
-
-TEST_CASE("extract version 0.0.1", "[extract image version number]")
-{
-    char versionLocal[] = "0.0.0";  //current running image
-    char versionRemote[12];//image from server
-    uint32_t u32DataLenght = sizeof(dataWithHttpRespone0_0_1)/sizeof(dataWithHttpRespone0_0_1[0]);
-    esp_err_t err = errMeshOtaUtilExtractVersionNumber(dataWithHttpRespone0_0_1, &u32DataLenght, versionRemote);
-    if(err == ESP_OK)
-    {
-        TEST_ASSERT_TRUE( bMeshOtaUtilNewerVersion(versionLocal, versionRemote)  );
-    }
-    else
-    {
-        TEST_ASSERT_EQUAL_INT(ESP_OK, err);
-    }
-}
-
-TEST_CASE("extract version 999.999.999", "[extract image version number]")
-{
-    char versionLocal[] = "0.0.0";  //current running image
-    char versionRemote[12];//image from server
-    uint32_t u32DataLenght = sizeof(dataWithHttpRespone999_999_999)/sizeof(dataWithHttpRespone999_999_999[0]);
-    esp_err_t err = errMeshOtaUtilExtractVersionNumber(dataWithHttpRespone999_999_999, &u32DataLenght, versionRemote);
-    if(err == ESP_OK)
-    {
-        TEST_ASSERT_TRUE( bMeshOtaUtilNewerVersion(versionLocal, versionRemote)  );
-    }
-    else
-    {
-        TEST_ASSERT_EQUAL_INT(ESP_OK, err);
-    }
-}
-
-TEST_CASE("extract version 999.99.999", "[extract image version number]")
-{
-    char versionLocal[] = "999.100.999";  //current running image
-    char versionRemote[12];//image from server
-    uint32_t u32DataLenght = sizeof(dataWithHttpRespone999_99_999)/sizeof(dataWithHttpRespone999_99_999[0]);
-    esp_err_t err = errMeshOtaUtilExtractVersionNumber(dataWithHttpRespone999_99_999, &u32DataLenght, versionRemote);
-    if(err == ESP_OK)
-    {
-        TEST_ASSERT_FALSE( bMeshOtaUtilNewerVersion(versionLocal, versionRemote)  );
-    }
-    else
-    {
-        TEST_ASSERT_EQUAL_INT(ESP_OK, err);
-    }
-}
-
-
-TEST_CASE("same MACs", "[check MAC equality]")
-{
-   unsigned char cMAC_A[] = "012345678901";  
-   unsigned char cMAC_B[] = "012345678901";  
-
-    TEST_ASSERT_TRUE( bMeshNetworkCheckMacEquality(cMAC_A,cMAC_B)  );
-}
-
-TEST_CASE("different MACs", "[check MAC equality]")
-{
-   unsigned char cMAC_A[] = "012345678901";  
-   unsigned char cMAC_B[] = "087464874718";  
-
-    TEST_ASSERT_FALSE( bMeshNetworkCheckMacEquality(cMAC_A,cMAC_B)  );
-}
-
-TEST_CASE("same MACs last A_byte+1", "[check MAC equality]")
-{
-   unsigned char cMAC_A[] = "012345678902";  
-   unsigned char cMAC_B[] = "012345678901"; 
-
-    TEST_ASSERT_TRUE( bMeshNetworkCheckMacEquality(cMAC_A,cMAC_B)  );
-}
-
-TEST_CASE("same MACs last B_byte+1", "[check MAC equality]")
-{
-   unsigned char cMAC_A[] = "012345678901";  
-   unsigned char cMAC_B[] = "012345678902"; 
-
-    TEST_ASSERT_TRUE( bMeshNetworkCheckMacEquality(cMAC_A,cMAC_B)  );
-}
-
-TEST_CASE("same MACs last B_byte+2", "[check MAC equality]")
-{
-   unsigned char cMAC_A[] = "012345678901";  
-   unsigned char cMAC_B[] = "012345678903"; 
-
-    TEST_ASSERT_TRUE( bMeshNetworkCheckMacEquality(cMAC_A,cMAC_B)  );
-}
-
-TEST_CASE("same Node0", "[check MAC equality]")
-{
-   unsigned char cMAC_A[] = "ac67b27162b0";  
-   unsigned char cMAC_B[] = "ac67b27162b0";   
-
-    TEST_ASSERT_TRUE( bMeshNetworkCheckMacEquality(cMAC_A,cMAC_B)  );
-}
-
-TEST_CASE("same Node0 first MAC+1", "[check MAC equality]")
-{
-   unsigned char cMAC_A[] = "ac67b27162b1";  
-   unsigned char cMAC_B[] = "ac67b27162b0";   
-
-    TEST_ASSERT_TRUE( bMeshNetworkCheckMacEquality(cMAC_A,cMAC_B)  );
-}
-
-TEST_CASE("same Node0 second MAC+1", "[check MAC equality]")
-{
-   unsigned char cMAC_A[] = "ac67b27162b0";  
-   unsigned char cMAC_B[] = "ac67b27162b1";   
-
-    TEST_ASSERT_TRUE( bMeshNetworkCheckMacEquality(cMAC_A,cMAC_B)  );
-}
-
-
-
-
-
-
-
-
-
-
--- a/main/Blinky_LED.c
+++ b/main/Blinky_LED.c
@ -1,257 +0,0 @@
-/**
-* @file Blinky_LED.c
-* @brief Demo application using the mesh network
-* @author Hendrik Schutter
-* @date 20.01.2021
-*
-* Additional Infos: If button "BOOT" on ESP32-Module is pressed, all LED2 (blue) in the network will toggle the state.
-*/
-
-#include "Blinky_LED.h"
-
-static const char *LOG_TAG = "blinky_led";
-static bool bLEDisOn = false; //set led default off
-static mesh_addr_t addrParent; //addr of parent node
-static mesh_addr_t childrenAddr[CONFIG_MESH_ROUTE_TABLE_SIZE]; //array of children attached to this node
-static uint16_t u16ChildrenSize; //number of children attached to this node
-xQueueHandle queueBlinkyLEDPackets; //handle for led action queue
-
-/**
-* @fn esp_err_t errBlinkyLEDInitialize()
-* @brief Starts the demp app
-* @param void
-* @return ESP32 error code
-* @author Hendrik Schutter
-* @date 20.01.2021
-*
-* Initialize the queue and starts the tasks
-*/
-esp_err_t errBlinkyLEDInitialize(void)
-{
-    esp_err_t err = ESP_OK;
-    BaseType_t xReturned;
-
-    vGPIOInitialize();
-
-    //create queue to store led action created from BTN and mesh network events
-    queueBlinkyLEDPackets = xQueueCreate(5, sizeof(BLINKY_PACKET_t));
-    if (queueBlinkyLEDPackets == 0)  // Queue not created
-        {
-            ESP_LOGE(LOG_TAG, "Unable to create Queue for Application Packets");
-            err = ESP_FAIL;
-        }
-
-    //register the receiver handle in mesh network
-    ERROR_CHECK(errMeshNetworkSetAppReceiveHandle(rxHandle));
-
-    if(err == ESP_OK)
-        {
-            xReturned = xTaskCreate(vTaskReadUserInput, "vTaskReadUserInput", 4096, NULL, 5, NULL);
-            if(xReturned != pdPASS)
-                {
-                    err = ESP_FAIL;
-                }
-        }
-
-    if(err == ESP_OK)
-        {
-            xReturned = xTaskCreate(vTaskReceiveData, "vTaskReceiveData", 4096, NULL, 5, NULL);
-            if(xReturned != pdPASS)
-                {
-                    err = ESP_FAIL;
-                }
-        }
-
-#ifdef NEW_VERSION
-    gpio_set_level(GPIO_LED_GREEN, 1); //switch on
-#endif
-
-#ifndef NEW_VERSION
-    gpio_set_level(GPIO_LED_GREEN, 0); //switch off
-#endif
-
-    return err;
-}
-
-/**
-* @fn void vGPIOInitialize(void)
-* @brief sets the GPIO pins to correct modes
-* @param void
-* @return void
-* @author Hendrik Schutter
-* @date 20.01.2021
-*
-* Initialize GPIO
-*/
-void vGPIOInitialize(void)
-{
-    gpio_config_t gpioConf;
-
-    //LED as Output
-    gpio_reset_pin(GPIO_LED_BLUE);
-    gpio_set_direction(GPIO_LED_BLUE, GPIO_MODE_OUTPUT);
-    gpio_reset_pin(GPIO_LED_GREEN);
-    gpio_set_direction(GPIO_LED_GREEN, GPIO_MODE_OUTPUT);
-
-    //BTN as Input
-    gpioConf.intr_type = GPIO_INTR_DISABLE;
-    gpioConf.mode = GPIO_MODE_INPUT;
-    gpioConf.pin_bit_mask = GPIO_INPUT_PIN_SEL;
-    gpioConf.pull_down_en = 0;
-    gpioConf.pull_up_en = 1;
-    gpio_config(&gpioConf);
-}
-
-/**
-* @fn void rxHandle(const uint8_t* const pu8Data, const uint8_t* const pu8Sender)
-* @brief callback handler from mesh network layer
-* @param pu8Data data received
-* @param pu8Sender sender node from data
-* @return void
-* @author Hendrik Schutter
-* @date 20.01.2021
-*
-* Adds the data into queue
-*/
-void rxHandle(const uint8_t* const pu8Data, const uint8_t* const pu8Sender)
-{
-    //send payload to app queue
-    BLINKY_PACKET_t bTmpPacket;
-    memcpy(&bTmpPacket, (uint8_t *)pu8Data, sizeof(BLINKY_PACKET_t));
-    memcpy(&bTmpPacket.meshSenderAddr, (uint8_t *)pu8Sender, 6); //copy MAC from sender into app packet
-    if (xQueueSend(queueBlinkyLEDPackets, &bTmpPacket, portMAX_DELAY) != pdPASS)
-        {
-            ESP_LOGE(LOG_TAG, "Unable to push packet from mesh into Queue");
-        }
-}
-
-/**
-* @fn void vTaskReadUserInput(void *arg)
-* @brief FreeRTOS task reading the user input (button)
-* @param args parameter for task
-* @return void
-* @author Hendrik Schutter
-* @date 20.01.2021
-*
-* Adds a button press to the queue
-*/
-void vTaskReadUserInput(void *arg)
-{
-    esp_err_t err = ESP_OK;
-    BLINKY_PACKET_t bTmpPacket;
-    MESH_PACKET_t meshPacket;
-
-    bTmpPacket.type = LED_OFF; //default off
-    meshPacket.type = APP_Data; //this is a app packet
-
-    while(true)
-        {
-            //check for BTN press
-            if(gpio_get_level(GPIO_BOOT_BTN) == 0)
-                {
-                    err = ESP_OK;
-
-                    if(bLEDisOn == false)
-                        {
-                            bTmpPacket.type = LED_ON;
-                        }
-                    else
-                        {
-                            bTmpPacket.type = LED_OFF;
-                        }
-
-                    //push led action into queue
-                    if (xQueueSend(queueBlinkyLEDPackets, &bTmpPacket, portMAX_DELAY) != pdPASS)
-                        {
-                            ESP_LOGE(LOG_TAG, "Unable to push packet into queue");
-                        }
-
-                    memcpy(meshPacket.au8Payload, &bTmpPacket, sizeof(BLINKY_PACKET_t));
-
-                    if(bMeshNetworkIsRootNode() == false)
-                        {
-                            //this node is not root --> send led action to parent
-                            ERROR_CHECK(errMeshNetworkGetParentNode(&addrParent));
-                            ERROR_CHECK(errMeshNetworkSendMeshPacket(&addrParent, &meshPacket));
-                        }
-                    else
-                        {
-                            //this node is root --> send led action to children
-                            ERROR_CHECK(errMeshNetworkGetChildren(childrenAddr, &u16ChildrenSize));
-
-                            for (uint16_t u16Index = 0; u16Index < u16ChildrenSize; u16Index++)
-                                {
-                                    ERROR_CHECK (errMeshNetworkSendMeshPacket(&childrenAddr[u16Index], &meshPacket));
-                                }
-                        }
-                    vTaskDelay(200 / portTICK_PERIOD_MS);
-                }
-            vTaskDelay(50 / portTICK_PERIOD_MS);
-        }
-}
-
-/**
-* @fn void vTaskReceiveData(void *arg)
-* @brief FreeRTOS task reading queue and setting the LED
-* @param args parameter for task
-* @return void
-* @author Hendrik Schutter
-* @date 20.01.2021
-*
-* Sets the LED off or on based on data in queue
-*/
-void vTaskReceiveData(void *arg)
-{
-    esp_err_t err = ESP_OK;
-    MESH_PACKET_t meshPacket;
-    BLINKY_PACKET_t bTmpPacket;
-
-    bTmpPacket.type = LED_OFF; //default off
-    meshPacket.type = APP_Data; //this is a app packet
-
-    while (1)
-        {
-            if (xQueueReceive(queueBlinkyLEDPackets, &bTmpPacket, portMAX_DELAY) != pdTRUE)
-                {
-                    ESP_LOGE(LOG_TAG, "Unable to receive packet from Queue");
-                }
-            else
-                {
-                    err = ESP_OK;
-                    //Successfully RECEIVED the packet
-                    switch (bTmpPacket.type)
-                        {
-                        case LED_ON:
-                            bLEDisOn = true;
-                            gpio_set_level(GPIO_LED_BLUE, 1); //switch on
-                            ESP_LOGI(LOG_TAG,"switch LED ON");
-                            break;
-
-                        case LED_OFF:
-                            bLEDisOn = false;
-                            gpio_set_level(GPIO_LED_BLUE, 0); //switch off
-                            ESP_LOGI(LOG_TAG,"switch LED OFF");
-                            break;
-
-                        default:
-                            bLEDisOn = false;
-                            gpio_set_level(GPIO_LED_BLUE, 0); //switch off
-                            ESP_LOGI(LOG_TAG,"switch LED OFF");
-                            break;
-                        }
-                }
-
-            ERROR_CHECK(errMeshNetworkGetChildren(childrenAddr, &u16ChildrenSize)); //get all children attached to this node
-            memcpy(meshPacket.au8Payload, &bTmpPacket, sizeof(BLINKY_PACKET_t)); //copy led action in mesh packet payload
-
-            for (uint16_t u16Index = 0; u16Index < u16ChildrenSize; u16Index++)
-                {
-                    //loop through children
-                    if(bMeshNetworkCheckMacEquality(bTmpPacket.meshSenderAddr.addr,  childrenAddr[u16Index].addr) == false) //exclude the sender node
-                        {
-                            ERROR_CHECK (errMeshNetworkSendMeshPacket(&childrenAddr[u16Index], &meshPacket)); //send to child
-                        }
-                }
-            vTaskDelay(200 / portTICK_PERIOD_MS);
-        }
-}
--- a/main/Blinky_LED.h
+++ b/main/Blinky_LED.h
@ -1,51 +0,0 @@
-/**
-* @file Blinky_LED.h
-* @brief Demo application using the mesh network
-* @author Hendrik Schutter
-* @date 20.01.2021
-*
-* Additional Infos: If button "BOOT" on ESP32-Module is pressed, all LED2 (blue) in the network will toggle the state.
-*/
-
-#ifndef H_BLINKY_LED
-#define H_BLINKY_LED
-
-#include <string.h>
-#include "esp_wifi.h"
-#include "esp_system.h"
-#include "esp_log.h"
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "driver/gpio.h"
-
-#include "Mesh_OTA.h"
-
-#define NEW_VERSION
-
-#define GPIO_BOOT_BTN   0 //GPIO0 (Boot BTN)
-#define GPIO_LED_BLUE   2 //GPIO2 (internal blue LED in DevKit V1.0)
-#define GPIO_LED_GREEN 13 //GPIO13
-
-#define GPIO_INPUT_PIN_SEL  (1ULL<<GPIO_BOOT_BTN)
-
-struct blinky_packet
-{
-    enum blinky_packet_type
-    {
-        LED_OFF,
-        LED_ON,
-    } type;
-    mesh_addr_t meshSenderAddr; //stores addr of sender of this packet
-};
-
-typedef struct blinky_packet BLINKY_PACKET_t;
-
-esp_err_t errBlinkyLEDInitialize(void);
-void vGPIOInitialize(void);
-void rxHandle(const uint8_t* const pu8Data, const uint8_t* const pu8Sender);
-void vTaskReadUserInput(void *arg);
-void vTaskReceiveData(void *arg);
-
-#endif /* H_BLINKY_LED */
-
-
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@ -1,2 +1,5 @@
-idf_component_register(SRCS "Blinky_LED.c" "Main.c"
+# Embed the server root certificate into the final binary
+#
+# (If this was a component, we would set COMPONENT_EMBED_TXTFILES here.)
+idf_component_register(SRCS "https_mbedtls_example_main.c"
                    INCLUDE_DIRS ".")
--- a/main/Kconfig.projbuild
+++ b/main/Kconfig.projbuild
@ -1,198 +0,0 @@
-menu "Mesh OTA Configuration"
-
-    choice
-        bool "Mesh Topology"
-        default MESH_TOPO_TREE
-        help
-            Mesh Network Topology.
-
-        config MESH_TOPO_TREE
-            bool "MESH_TOPO_TREE"
-        config MESH_TOPO_CHAIN
-            bool "MESH_TOPO_CHAIN"
-    endchoice
-
-    config MESH_TOPOLOGY
-        int
-        default 0 if MESH_TOPO_TREE
-        default 1 if MESH_TOPO_CHAIN
-        help
-            Mesh Network Topology.
-
-    config MESH_ENABLE_PS
-        bool "Enable mesh PS (power save) function"
-        default y
-        help
-            Enable/Disable Power Save function.
-
-    choice
-        bool "Mesh PS device duty cycle type"
-        depends on MESH_ENABLE_PS
-        default MESH_PS_DEV_DUTY_TYPE_REQUEST
-        help
-            Mesh PS device duty cycle type.
-
-        config MESH_PS_DEV_DUTY_TYPE_REQUEST
-            bool "MESH_PS_DEV_DUTY_TYPE_REQUEST"
-        config MESH_PS_DEV_DUTY_TYPE_DEMAND
-            bool "MESH_PS_DEV_DUTY_TYPE_DEMAND"
-    endchoice
-
-    config MESH_PS_DEV_DUTY_TYPE
-        int
-        depends on MESH_ENABLE_PS
-        default 1 if MESH_PS_DEV_DUTY_TYPE_REQUEST
-        default 4 if MESH_PS_DEV_DUTY_TYPE_DEMAND
-        help
-            Mesh PS device duty cycle type.
-
-    config MESH_PS_DEV_DUTY
-        int "Mesh PS device duty cycle"
-        depends on MESH_ENABLE_PS
-        range 1 100
-        default 12
-        help
-            Mesh PS device duty cycle.
-
-    config MESH_PS_NWK_DUTY
-        int "Mesh PS network duty cycle"
-        depends on MESH_ENABLE_PS
-        range 1 100
-        default 12
-        help
-            Mesh PS network duty cycle.
-
-    config MESH_PS_NWK_DUTY_DURATION
-        int "Mesh PS network duty cycle duration (unit: minutes)"
-        depends on MESH_ENABLE_PS
-        range -1 100
-        default -1
-        help
-            Mesh PS network duty cycle duration.
-
-    choice
-        bool "Mesh PS network duty cycle rule"
-        depends on MESH_ENABLE_PS
-        default MESH_PS_NETWORK_DUTY_APPLIED_ENTIRE
-        help
-            Mesh PS network duty cycle rule.
-
-        config MESH_PS_NETWORK_DUTY_APPLIED_ENTIRE
-            bool "MESH_PS_NETWORK_DUTY_APPLIED_ENTIRE"
-        config MESH_PS_NETWORK_DUTY_APPLIED_UPLINK
-            bool "MESH_PS_NETWORK_DUTY_APPLIED_UPLINK"
-    endchoice
-
-    config MESH_PS_NWK_DUTY_RULE
-        int
-        depends on MESH_ENABLE_PS
-        default 0 if MESH_PS_NETWORK_DUTY_APPLIED_ENTIRE
-        default 1 if MESH_PS_NETWORK_DUTY_APPLIED_UPLINK
-        help
-            Mesh PS network duty cycle rule.
-
-    config MESH_MAX_LAYER
-        int "Mesh Max Layer"
-        range 1 25 if MESH_TOPO_TREE
-        range 1 1000 if MESH_TOPO_CHAIN
-        default 6
-        help
-            Max layer allowed in mesh network.
-
-    config MESH_CHANNEL
-        int "channel"
-        range 0 14
-        default 0
-        help
-            mesh network channel.
-            
-    config MESH_ID
-        string "ID for mesh network"
-        default "00, 00, 00, 00, 00, 00"
-        help
-            Mesh network id like MAC addr.
-
-    config MESH_ROUTER_SSID
-        string "Router SSID"
-        default "ROUTER_SSID"
-        help
-            Router SSID.
-
-    config MESH_ROUTER_PASSWD
-        string "Router password"
-        default "ROUTER_PASSWD"
-        help
-            Router password.
-
-    choice
-        bool "Mesh AP Authentication Mode"
-        default WIFI_AUTH_WPA2_PSK
-        help
-            Authentication mode.
-
-        config WIFI_AUTH_WPA2_PSK
-            bool "WIFI_AUTH_WPA2_PSK"
-        config WIFI_AUTH_WPA2_ENTERPRISE
-            bool "WIFI_AUTH_WPA2_ENTERPRISE"
-    endchoice
-
-    config MESH_AP_AUTHMODE
-        int
-
-        default 3 if WIFI_AUTH_WPA2_PSK
-        default 5 if WIFI_AUTH_WPA2_ENTERPRISE
-        help
-            Mesh AP authentication mode.
-
-    config MESH_AP_PASSWD
-        string "Mesh AP Password"
-        default "MAP_PASSWD"
-        help
-            Mesh AP password.
-
-    config MESH_AP_CONNECTIONS
-        int "Mesh AP Connections"
-        range 1 10
-        default 6
-        help
-            The number of stations allowed to connect in.
-
-    config MESH_ROUTE_TABLE_SIZE
-        int "Mesh Routing Table Size"
-        range 1 300
-        default 50
-        help
-            The number of devices over the network(max: 300).
-            
-    config MESH_MESSAGE_SIZE
-        int "Mesh network messages size"
-        range 1 65536
-        default 1500
-        help
-            Length of messages deliveres by the mesh network.
-            
-    config OTA_HTTPS_SERVER_COMMON_NAME
-        string "Common name OTA server"
-        default "exmaple.com"
-        help
-           Fully Qualified Domain Name used in the certificate.
-           
-    config OTA_HTTPS_SERVER_PORT
-        string "Server port"
-        default "443"
-        help
-           HTTPS webserver port
-           
-    config OTA_HTTPS_URL
-        string "URL to ota image"
-        default "https://exmaple.com/theImage.bin"
-        help
-           Uniform Resource Locator to the image file
-           
-    config OTA_HTTPS_AUTH
-        string "HTTPS authentication"
-        default "base64(user:password)"
-        help
-           HTTPS basic auth using base64 decoded "user:password"
-           
-endmenu
--- a/main/Main.c
+++ b/main/Main.c
@ -1,30 +0,0 @@
-#include <stdio.h>
-#include "sdkconfig.h"
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "esp_system.h"
-#include "esp_spi_flash.h"
-
-#include "Mesh_OTA.h"
-#include "Blinky_LED.h"
-
-static const char *LOG_TAG = "esp_main";
-
-void app_main(void)
-{
-    esp_err_t err = ESP_OK;
-
-    ESP_LOGI(LOG_TAG, "start mesh network");
-    err = errMeshNetworkInitialize();
-    ESP_ERROR_CHECK(err);
-
-    ESP_LOGI(LOG_TAG, "start ota");
-    err = errMeshOTAInitialize();
-    ESP_ERROR_CHECK(err);
-
-    ESP_LOGI(LOG_TAG, "start app");
-    err = errBlinkyLEDInitialize();
-    ESP_ERROR_CHECK(err);
-}
-
-
--- a/main/component.mk
+++ b/main/component.mk
@ -2,4 +2,3 @@
 # "main" pseudo-component makefile.
 #
 # (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
--- a/main/https_mbedtls_example_main.c
+++ b/main/https_mbedtls_example_main.c
@ -0,0 +1,418 @@
+#include <string.h>
+#include <stdlib.h>
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "esp_wifi.h"
+#include "esp_event.h"
+#include "esp_log.h"
+#include "esp_system.h"
+#include "nvs_flash.h"
+#include "protocol_examples_common.h"
+#include "esp_netif.h"
+
+#include "lwip/err.h"
+#include "lwip/sockets.h"
+#include "lwip/sys.h"
+#include "lwip/netdb.h"
+#include "lwip/dns.h"
+
+#include "mbedtls/platform.h"
+#include "mbedtls/net_sockets.h"
+#include "mbedtls/esp_debug.h"
+#include "mbedtls/ssl.h"
+#include "mbedtls/entropy.h"
+#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/error.h"
+#include "mbedtls/certs.h"
+#include "esp_crt_bundle.h"
+
+
+/* Constants that aren't configurable in menuconfig, yet */
+#define HTTPS_CLIENT_COMMON_NAME "ota.hendrikschutter.com"
+#define HTTPS_CLIENT_PORT "443"
+#define HTTPS_CLIENT_URL "https://ota.hendrikschutter.com/hex.txt"
+#define HTTPS_CLIENT_AUTH "b3RhOnB3"  //base64("username:password")
+
+#define HTTPS_CLIENT_OK 0
+#define HTTPS_CLIENT_ERROR -1
+#define HTTPS_CLIENT_ERROR_INIT_EMBEDTLS -2
+#define HTTPS_CLIENT_ERROR_INIT_CONNECT_TWO_SERVER -3
+#define HTTPS_CLIENT_ERROR_INIT_VALIDATE_SERVER -4
+#define HTTPS_CLIENT_ERROR_INIT_SEND_REQUEST -5
+
+struct HTTPS_Client
+{
+    mbedtls_entropy_context entropy;
+    mbedtls_ctr_drbg_context ctr_drbg;
+    mbedtls_ssl_context ssl;
+    mbedtls_x509_crt cacert;
+    mbedtls_ssl_config conf;
+    mbedtls_net_context server_fd;
+};
+
+typedef int32_t https_client_ret_t;
+typedef struct HTTPS_Client HTTPS_Client_t;
+
+static const char *TAG = "https_client";
+
+static const char *REQUEST = "GET " HTTPS_CLIENT_URL " HTTP/1.1\r\n"
+                             "Host: "HTTPS_CLIENT_COMMON_NAME"\r\n"
+                             "User-Agent: esp-idf/1.0 esp32\r\n"
+                             "Authorization: Basic " HTTPS_CLIENT_AUTH "\r\n"
+                             "\r\n";
+
+static HTTPS_Client_t sHTTPS_ClientConfig;
+
+https_client_ret_t https_clientInitialize();
+https_client_ret_t https_clientRetrieveData();
+https_client_ret_t https_clientDeinitialize();
+
+https_client_ret_t https_clientInitEmbedTLS();
+https_client_ret_t https_clientConnectToServer();
+https_client_ret_t https_clientValidateServer();
+https_client_ret_t https_clientSendRequest();
+
+https_client_ret_t https_clientInitialize()
+{
+    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
+
+    i32RetHTTPClient = https_clientInitEmbedTLS();
+
+    /*
+        if(i32RetHTTPClient == HTTPS_CLIENT_OK)
+        {
+            i32RetHTTPClient = https_clientConnectToServer();
+        }
+
+        if(i32RetHTTPClient == HTTPS_CLIENT_OK)
+        {
+            i32RetHTTPClient = https_clientValidateServer();
+        }
+
+        if(i32RetHTTPClient == HTTPS_CLIENT_OK)
+        {
+            i32RetHTTPClient = https_clientSendRequest();
+        }
+        */
+    switch (i32RetHTTPClient)
+    {
+    case HTTPS_CLIENT_ERROR_INIT_EMBEDTLS:
+        ESP_LOGE(TAG, "Unable to initialize EmbedTLS");
+        i32RetHTTPClient = HTTPS_CLIENT_ERROR;
+        break;
+    case HTTPS_CLIENT_ERROR_INIT_CONNECT_TWO_SERVER:
+        ESP_LOGE(TAG, "Unable to connect to server");
+        i32RetHTTPClient = HTTPS_CLIENT_ERROR;
+        break;
+    case HTTPS_CLIENT_ERROR_INIT_VALIDATE_SERVER:
+        ESP_LOGE(TAG, "Unable to validate the server");
+        i32RetHTTPClient = HTTPS_CLIENT_ERROR;
+        break;
+    case HTTPS_CLIENT_ERROR_INIT_SEND_REQUEST:
+        ESP_LOGE(TAG, "Unable to send request to server");
+        i32RetHTTPClient = HTTPS_CLIENT_ERROR;
+        break;
+    case HTTPS_CLIENT_OK:
+        ESP_LOGI(TAG, "HTTPS Client successfully initialized");
+        i32RetHTTPClient = HTTPS_CLIENT_OK;
+        break;
+    default:
+        i32RetHTTPClient = HTTPS_CLIENT_ERROR;
+        ESP_LOGE(TAG, "Unknown error while init");
+        break;
+    }
+
+    return i32RetHTTPClient;
+}
+
+https_client_ret_t https_clientRetrieveData(unsigned char* pu8Data, uint32_t* pu32DataLenght, uint32_t* pu32BytesRead)
+{
+    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
+    int32_t i32RetRetrieveData = ESP_OK;
+    bzero(pu8Data, *pu32DataLenght);
+    bool bRetriveData = true;
+    *pu32BytesRead = 0U;
+
+    while (bRetriveData)
+    {
+        //Reading HTTP response
+        mbedtls_ssl_conf_read_timeout(&sHTTPS_ClientConfig.conf, 1000); //mbedtls_ssl_config * 	conf,
+        i32RetRetrieveData = mbedtls_ssl_read(&sHTTPS_ClientConfig.ssl, (unsigned char *)(pu8Data+(*pu32BytesRead)), ((*pu32DataLenght)-(*pu32BytesRead))  );
+
+        if(i32RetRetrieveData > 0)
+        {
+            //Data received
+            *pu32BytesRead = *pu32BytesRead + i32RetRetrieveData;
+
+            if(*pu32DataLenght > 0)
+            {
+                //buffer not full yet --> read some more
+                bRetriveData = true;
+            }
+            else
+            {
+                //buffer full --> stop reading
+                bRetriveData = false;
+            }
+        }
+
+        if(i32RetRetrieveData == 0)
+        {
+            //all data read --> stop reading
+            bRetriveData = false;
+        }
+
+        if(i32RetRetrieveData == MBEDTLS_ERR_SSL_TIMEOUT ) {
+            printf("timeout\n");
+            bRetriveData = false;
+        }
+
+
+
+        if(i32RetRetrieveData == MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY)
+        {
+            //connection is going to be closed
+            i32RetHTTPClient = HTTPS_CLIENT_ERROR;
+            bRetriveData = false;
+        }
+    }
+    return i32RetHTTPClient;
+}
+
+https_client_ret_t https_clientDeinitialize()
+{
+    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
+
+    i32RetHTTPClient = mbedtls_ssl_close_notify(&sHTTPS_ClientConfig.ssl);
+
+    if(i32RetHTTPClient != ESP_OK)
+    {
+        ESP_LOGE(TAG, "mbedtls_ssl_close_notify returned 0x%x", i32RetHTTPClient);
+    }
+
+    mbedtls_ssl_session_reset(&sHTTPS_ClientConfig.ssl);
+    mbedtls_net_free(&sHTTPS_ClientConfig.server_fd);
+
+    return i32RetHTTPClient;
+}
+
+https_client_ret_t https_clientInitEmbedTLS() {
+
+    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
+    int32_t i32RetEmbedTLS = ESP_OK;
+
+    mbedtls_ssl_init(&sHTTPS_ClientConfig.ssl);
+    mbedtls_x509_crt_init(&sHTTPS_ClientConfig.cacert);
+    mbedtls_ctr_drbg_init(&sHTTPS_ClientConfig.ctr_drbg);
+    mbedtls_ssl_config_init(&sHTTPS_ClientConfig.conf);
+    mbedtls_entropy_init(&sHTTPS_ClientConfig.entropy);
+
+    i32RetEmbedTLS = mbedtls_ctr_drbg_seed(&sHTTPS_ClientConfig.ctr_drbg, mbedtls_entropy_func, &sHTTPS_ClientConfig.entropy, NULL, 0);
+
+    if(i32RetEmbedTLS!= ESP_OK)
+    {
+        ESP_LOGE(TAG, "mbedtls_ctr_drbg_seed returned %d", i32RetEmbedTLS);
+    }
+
+    if(i32RetEmbedTLS == ESP_OK)
+    {
+        //Attaching the certificate bundle
+        i32RetEmbedTLS = esp_crt_bundle_attach(&sHTTPS_ClientConfig.conf);
+        if(i32RetEmbedTLS != ESP_OK)
+        {
+            ESP_LOGE(TAG, "esp_crt_bundle_attach returned 0x%x\n\n", i32RetEmbedTLS);
+        }
+    }
+
+    if(i32RetEmbedTLS == ESP_OK)
+    {
+        //Setting hostname for TLS session.
+        i32RetEmbedTLS = mbedtls_ssl_set_hostname(&sHTTPS_ClientConfig.ssl, HTTPS_CLIENT_COMMON_NAME);
+        // Hostname set here should match CN in server certificate
+        if(i32RetEmbedTLS != ESP_OK)
+        {
+            ESP_LOGE(TAG, "mbedtls_ssl_set_hostname returned 0x%x", i32RetEmbedTLS);
+        }
+    }
+    if(i32RetEmbedTLS == ESP_OK)
+    {
+        //Setting up the SSL/TLS structure
+        i32RetEmbedTLS = mbedtls_ssl_config_defaults(&sHTTPS_ClientConfig.conf,
+                         MBEDTLS_SSL_IS_CLIENT,
+                         MBEDTLS_SSL_TRANSPORT_STREAM,
+                         MBEDTLS_SSL_PRESET_DEFAULT);
+
+        if(i32RetEmbedTLS != ESP_OK)
+        {
+            ESP_LOGE(TAG, "mbedtls_ssl_config_defaults returned %d", i32RetEmbedTLS);
+        }
+    }
+
+    if(i32RetEmbedTLS == ESP_OK)
+    {
+        mbedtls_ssl_conf_authmode(&sHTTPS_ClientConfig.conf, MBEDTLS_SSL_VERIFY_REQUIRED);
+        mbedtls_ssl_conf_ca_chain(&sHTTPS_ClientConfig.conf, &sHTTPS_ClientConfig.cacert, NULL);
+        mbedtls_ssl_conf_rng(&sHTTPS_ClientConfig.conf, mbedtls_ctr_drbg_random, &sHTTPS_ClientConfig.ctr_drbg);
+
+        i32RetEmbedTLS = mbedtls_ssl_setup(&sHTTPS_ClientConfig.ssl, &sHTTPS_ClientConfig.conf);
+        if(i32RetEmbedTLS != ESP_OK)
+        {
+            ESP_LOGE(TAG, "mbedtls_ssl_setup returned -0x%x\n\n", i32RetEmbedTLS);
+        }
+    }
+
+    if(i32RetEmbedTLS == ESP_OK)
+    {
+        mbedtls_net_init(&sHTTPS_ClientConfig.server_fd);
+    }
+
+    if (i32RetEmbedTLS != ESP_OK)
+    {
+        i32RetHTTPClient = HTTPS_CLIENT_ERROR_INIT_EMBEDTLS;
+    }
+
+    return i32RetHTTPClient;
+}
+
+https_client_ret_t https_clientConnectToServer()
+{
+    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
+    int32_t i32RetServerConnect = ESP_OK;
+
+    //Connecting to server
+    i32RetServerConnect = mbedtls_net_connect(&sHTTPS_ClientConfig.server_fd, HTTPS_CLIENT_COMMON_NAME, HTTPS_CLIENT_PORT, MBEDTLS_NET_PROTO_TCP);
+    if (i32RetServerConnect != ESP_OK)
+    {
+        ESP_LOGE(TAG, "mbedtls_net_connect returned %x", i32RetServerConnect);
+    }
+
+    if(i32RetServerConnect == ESP_OK)
+    {
+        mbedtls_ssl_set_bio(&sHTTPS_ClientConfig.ssl, &sHTTPS_ClientConfig.server_fd, mbedtls_net_send, mbedtls_net_recv, mbedtls_net_recv_timeout);
+
+        //Performing the SSL/TLS handshake
+        while ((i32RetServerConnect = mbedtls_ssl_handshake(&sHTTPS_ClientConfig.ssl)) != 0)
+        {
+            if ((i32RetServerConnect != MBEDTLS_ERR_SSL_WANT_READ) && (i32RetServerConnect != MBEDTLS_ERR_SSL_WANT_WRITE))
+            {
+                ESP_LOGE(TAG, "mbedtls_ssl_handshake returned 0x%x", i32RetServerConnect);
+            }
+        }
+    }
+
+    if(i32RetServerConnect != ESP_OK)
+    {
+        i32RetHTTPClient = HTTPS_CLIENT_ERROR_INIT_CONNECT_TWO_SERVER;
+    }
+    return i32RetHTTPClient;
+}
+
+https_client_ret_t https_clientValidateServer()
+{
+    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
+    int32_t i32RetValidateServer = ESP_OK;
+
+    //Verifying peer X.509 certificate
+    if ((i32RetValidateServer = mbedtls_ssl_get_verify_result(&sHTTPS_ClientConfig.ssl)) != 0)
+    {
+        ESP_LOGE(TAG, "Failed to verify peer certificate!");
+    }
+
+    if(i32RetValidateServer != ESP_OK)
+    {
+        i32RetHTTPClient = HTTPS_CLIENT_ERROR_INIT_VALIDATE_SERVER;
+    }
+    return i32RetHTTPClient;
+}
+
+https_client_ret_t https_clientSendRequest()
+{
+    https_client_ret_t i32RetHTTPClient = HTTPS_CLIENT_OK;
+    int32_t i32RetSendRequest = ESP_OK;
+    uint32_t u32WrittenBytes = 0;
+    bool bWrite = true;
+
+    //Writing HTTP request
+    while((u32WrittenBytes < strlen(REQUEST)) && bWrite)
+    {
+        i32RetSendRequest = mbedtls_ssl_write(&sHTTPS_ClientConfig.ssl,
+                                              (const unsigned char *)REQUEST + u32WrittenBytes,
+                                              strlen(REQUEST) - u32WrittenBytes);
+        if (i32RetSendRequest >= 0)
+        {
+            //bytes written
+            u32WrittenBytes += i32RetSendRequest;
+        } else if (i32RetSendRequest != MBEDTLS_ERR_SSL_WANT_WRITE && i32RetSendRequest != MBEDTLS_ERR_SSL_WANT_READ) {
+            ESP_LOGE(TAG, "mbedtls_ssl_write returned 0x%x", i32RetSendRequest);
+            bWrite = false;
+        }
+    }
+
+    if(bWrite == false)
+    {
+        i32RetHTTPClient = HTTPS_CLIENT_ERROR_INIT_SEND_REQUEST;
+    }
+    return i32RetHTTPClient;
+}
+
+
+
+static void https_get_task(void *pvParameters)
+{
+
+    uint32_t u32BufferLenght = 1024U;
+    unsigned char buffer[1024U];
+    uint32_t u32BytesRead = 0;
+    uint32_t u32readCount = 0U;
+
+    uint32_t loops = 0;
+
+    https_clientInitialize();
+
+    while(1)
+    {
+        u32BytesRead = 0;
+        u32readCount = 0U;
+
+        printf("\n START:%i \n", loops);
+
+        https_clientConnectToServer();
+        https_clientValidateServer();
+        https_clientSendRequest();
+
+        do {
+
+            https_clientRetrieveData(buffer, &u32BufferLenght, &u32BytesRead);
+            printf("read: %i\n", u32BytesRead);
+            u32readCount++;
+        } while(u32BytesRead > 0);
+        printf("\n END:%i - %i\n", loops, u32readCount);
+
+        https_clientDeinitialize();
+
+        vTaskDelay( 500/portTICK_PERIOD_MS);
+
+        loops++;
+    }
+
+    while(1)
+    {
+        vTaskDelay( 500/portTICK_PERIOD_MS);
+    }
+
+}
+
+void app_main(void)
+{
+    ESP_ERROR_CHECK( nvs_flash_init() );
+    ESP_ERROR_CHECK(esp_netif_init());
+    ESP_ERROR_CHECK(esp_event_loop_create_default());
+
+    /* This helper function configures Wi-Fi or Ethernet, as selected in menuconfig.
+     * Read "Establishing Wi-Fi or Ethernet Connection" section in
+     * examples/protocols/README.md for more information about this function.
+     */
+    ESP_ERROR_CHECK(example_connect());
+
+    xTaskCreate(&https_get_task, "https_get_task", 8192, NULL, 5, NULL);
+}
--- a/partitions.csv
+++ b/partitions.csv
@ -1,7 +0,0 @@
-# Name,   Type, SubType, Offset,   Size, Flags
-# Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap
-nvs,      data, nvs,     ,        0x4000,
-otadata,  data, ota,     ,        0x2000,
-phy_init, data, phy,     ,        0x1000,
-ota_0,    app,  ota_0,   ,        1500K,
-ota_1,    app,  ota_1,   ,        1500K, 
--- a/71
+++ b/71
@ -31,8 +31,7 @@ CONFIG_APP_BUILD_USE_FLASH_SECTIONS=y
 CONFIG_APP_COMPILE_TIME_DATE=y
 # CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
 # CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
-CONFIG_APP_PROJECT_VER_FROM_CONFIG=y
-CONFIG_APP_PROJECT_VER="0.1.3"
+# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set
 CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
 # end of Application manager

@ -67,16 +66,8 @@ CONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0
 #
 # Security features
 #
-CONFIG_SECURE_SIGNED_ON_BOOT=y
-CONFIG_SECURE_SIGNED_ON_UPDATE=y
-CONFIG_SECURE_SIGNED_APPS=y
-CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT=y
-CONFIG_SECURE_SIGNED_APPS_ECDSA_SCHEME=y
-CONFIG_SECURE_SIGNED_ON_BOOT_NO_SECURE_BOOT=y
-CONFIG_SECURE_SIGNED_ON_UPDATE_NO_SECURE_BOOT=y
+# CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT is not set
 # CONFIG_SECURE_BOOT is not set
-CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES=y
-CONFIG_SECURE_BOOT_SIGNING_KEY="secure_boot_signing_key.pem"
 # CONFIG_SECURE_FLASH_ENC_ENABLED is not set
 # end of Security features

@ -96,11 +87,11 @@ CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
 # CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set
 CONFIG_ESPTOOLPY_FLASHFREQ="40m"
 # CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
-# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y
+# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
-CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
+CONFIG_ESPTOOLPY_FLASHSIZE="2MB"
 CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
 CONFIG_ESPTOOLPY_BEFORE_RESET=y
 # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
@ -123,48 +114,28 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 #
 # Partition Table
 #
-# CONFIG_PARTITION_TABLE_SINGLE_APP is not set
+CONFIG_PARTITION_TABLE_SINGLE_APP=y
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
-CONFIG_PARTITION_TABLE_CUSTOM=y
+# CONFIG_PARTITION_TABLE_CUSTOM is not set
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
-CONFIG_PARTITION_TABLE_OFFSET=0x10000
+CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp.csv"
+CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table

 #
-# Mesh OTA Configuration
+# Example Connection Configuration
 #
-CONFIG_MESH_TOPO_TREE=y
-# CONFIG_MESH_TOPO_CHAIN is not set
-CONFIG_MESH_TOPOLOGY=0
-CONFIG_MESH_ENABLE_PS=y
-CONFIG_MESH_PS_DEV_DUTY_TYPE_REQUEST=y
-# CONFIG_MESH_PS_DEV_DUTY_TYPE_DEMAND is not set
-CONFIG_MESH_PS_DEV_DUTY_TYPE=1
-CONFIG_MESH_PS_DEV_DUTY=12
-CONFIG_MESH_PS_NWK_DUTY=12
-CONFIG_MESH_PS_NWK_DUTY_DURATION=-1
-CONFIG_MESH_PS_NETWORK_DUTY_APPLIED_ENTIRE=y
-# CONFIG_MESH_PS_NETWORK_DUTY_APPLIED_UPLINK is not set
-CONFIG_MESH_PS_NWK_DUTY_RULE=0
-CONFIG_MESH_MAX_LAYER=6
-CONFIG_MESH_CHANNEL=13
-CONFIG_MESH_ID="00, 00, 00, 00, 00, 00"
-CONFIG_MESH_ROUTER_SSID="labNet"
-CONFIG_MESH_ROUTER_PASSWD="12345678"
-CONFIG_WIFI_AUTH_WPA2_PSK=y
-# CONFIG_WIFI_AUTH_WPA2_ENTERPRISE is not set
-CONFIG_MESH_AP_AUTHMODE=3
-CONFIG_MESH_AP_PASSWD="qaws1234"
-CONFIG_MESH_AP_CONNECTIONS=6
-CONFIG_MESH_ROUTE_TABLE_SIZE=50
-CONFIG_MESH_MESSAGE_SIZE=1234
-CONFIG_OTA_HTTPS_SERVER_COMMON_NAME="ota.hendrikschutter.com"
-CONFIG_OTA_HTTPS_SERVER_PORT="443"
-CONFIG_OTA_HTTPS_URL="https://ota.hendrikschutter.com/mesh_ota.bin"
-CONFIG_OTA_HTTPS_AUTH="b3RhOnB3"
-# end of Mesh OTA Configuration
+CONFIG_EXAMPLE_CONNECT_WIFI=y
+CONFIG_EXAMPLE_WIFI_SSID="labNet"
+CONFIG_EXAMPLE_WIFI_PASSWORD="12345678"
+# CONFIG_EXAMPLE_CONNECT_ETHERNET is not set
+CONFIG_EXAMPLE_CONNECT_IPV6=y
+CONFIG_EXAMPLE_CONNECT_IPV6_PREF_LOCAL_LINK=y
+# CONFIG_EXAMPLE_CONNECT_IPV6_PREF_GLOBAL is not set
+# CONFIG_EXAMPLE_CONNECT_IPV6_PREF_SITE_LOCAL is not set
+# CONFIG_EXAMPLE_CONNECT_IPV6_PREF_UNIQUE_LOCAL is not set
+# end of Example Connection Configuration

 #
 # Compiler options
@ -1064,7 +1035,7 @@ CONFIG_WS_BUFFER_SIZE=1024
 #
 CONFIG_UNITY_ENABLE_FLOAT=y
 CONFIG_UNITY_ENABLE_DOUBLE=y
-CONFIG_UNITY_ENABLE_COLOR=y
+# CONFIG_UNITY_ENABLE_COLOR is not set
 CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y
 # CONFIG_UNITY_ENABLE_FIXTURE is not set
 # CONFIG_UNITY_ENABLE_BACKTRACE_ON_FAIL is not set
--- a/secure_boot_signing_key.pem
+++ b/secure_boot_signing_key.pem
@ -1,5 +0,0 @@
-----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIPADEvh72EIFEGixpoyTcMq6k3TdS5vYytoCd/aFdcOUoAoGCCqGSM49
-AwEHoUQDQgAE3LyvSuovRT0+O9V8fcjvdHT1vaS2RRs6Zh7RKd3LemhOR+ZZ7KmE
-7QZiCmbVxMsano1h8rJG0m4PSv/eQ03K8A==
-----END EC PRIVATE KEY-----
--- a/style_code.sh
+++ b/style_code.sh
@ -1,15 +0,0 @@
-#! /bin/bash
-
-cd main
-astyle --style=gnu *.c
-astyle --style=gnu *.h
-
-cd ..
-
-cd components/mesh_ota
-astyle --style=gnu *.c
-cd include
-astyle --style=gnu *.h
-
-
-
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@ -1,16 +0,0 @@
-# This is the project CMakeLists.txt file for the test subproject
-cmake_minimum_required(VERSION 3.5)
-
-# Include the components directory of the main application:
-#
-set(EXTRA_COMPONENT_DIRS "../components")
-
-# Set the components to include the tests for.
-# This can be overriden from CMake cache:
-# - when invoking CMake directly: cmake -D TEST_COMPONENTS="xxxxx" ..
-# - when using idf.py: idf.py -T xxxxx build
-#
-set(TEST_COMPONENTS "mesh_ota" CACHE STRING "List of components to test")
-
-include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-project(unit_test_mesh_ota)
--- a/test/Makefile
+++ b/test/Makefile
@ -1,17 +0,0 @@
-#
-# This is a project Makefile for the test subproject.
-#
-
-PROJECT_NAME := unit_test_mesh_ota
-
-# Include the components directory of the main application:
-#
-EXTRA_COMPONENT_DIRS := $(realpath ../components)
-
-# Set the components to include the tests for.
-# This can be overriden from the command line
-# (e.g. 'make TEST_COMPONENTS=xxxx flash monitor')
-#
-TEST_COMPONENTS ?= mesh_ota
-
-include $(IDF_PATH)/make/project.mk
--- a/test/main/CMakeLists.txt
+++ b/test/main/CMakeLists.txt
@ -1,2 +0,0 @@
-idf_component_register(SRCS "unit_test_mesh_ota.c"
-                    INCLUDE_DIRS ".")
--- a/test/main/component.mk
+++ b/test/main/component.mk
--- a/test/main/unit_test_mesh_ota.c
+++ b/test/main/unit_test_mesh_ota.c
@ -1,58 +0,0 @@
-/* Example test application for testable component.
-
-   This example code is in the Public Domain (or CC0 licensed, at your option.)
-
-   Unless required by applicable law or agreed to in writing, this
-   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-   CONDITIONS OF ANY KIND, either express or implied.
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include "unity.h"
-
-static void print_banner(const char* text);
-
-void app_main(void)
-{
-    /* These are the different ways of running registered tests.
-     * In practice, only one of them is usually needed.
-     *
-     * UNITY_BEGIN() and UNITY_END() calls tell Unity to print a summary
-     * (number of tests executed/failed/ignored) of tests executed between these calls.
-     */
-    
-    /*
-    print_banner("Executing one test by its name");
-    UNITY_BEGIN();
-    unity_run_test_by_name("Mean of an empty array is zero");
-    UNITY_END();
-
-    print_banner("Running tests with [mean] tag");
-    UNITY_BEGIN();
-    unity_run_tests_by_tag("[mean]", false);
-    UNITY_END();
-
-    print_banner("Running tests without [fails] tag");
-    UNITY_BEGIN();
-    unity_run_tests_by_tag("[fails]", true);
-    UNITY_END();
-*/
-    
-    
-    print_banner("Running all the registered tests");
-    UNITY_BEGIN();
-    unity_run_all_tests();
-    UNITY_END();
-
-    print_banner("Starting interactive test menu");
-    /* This function will not return, and will be busy waiting for UART input.
-     * Make sure that task watchdog is disabled if you use this function.
-     */
-    unity_run_menu();
-}
-
-static void print_banner(const char* text)
-{
-    printf("\n#### %s #####\n\n", text);
-}
--- a/test/sdkconfig
+++ b/test/sdkconfig
--- a/test/sdkconfig.defaults
+++ b/test/sdkconfig.defaults
@ -1 +0,0 @@
-CONFIG_ESP_TASK_WDT=n
Author	SHA1	Message	Date
Hendrik Schutter	3c0232c7de	fixed reuse of mbedtls	2021-01-18 16:12:53 +01:00
Hendrik Schutter	7afe6bb195	added tls read timeout	2021-01-18 13:40:34 +01:00
Hendrik Schutter	8e7f4e68dc	fix: https download offset	2021-01-08 22:29:33 +01:00
Hendrik Schutter	d50985c577	https client module for ota image download	2021-01-04 17:03:18 +01:00
Hendrik Schutter	a787a18d21	added auth	2021-01-03 18:19:54 +01:00
Hendrik Schutter	4ec9fecee5	initial idf example	2021-01-03 12:15:12 +01:00