refact bool espera -> sentido (giro servo)

mejora en función de accionamiento del servo
ed: README
2022-10-26 04:16:55 -03:00 · 2022-10-26 03:28:26 -03:00 · 2022-09-24 20:12:42 -03:00 · 2022-05-27 22:11:40 -04:00 · 2022-05-27 22:09:39 -04:00 · 2022-04-27 01:56:18 -04:00
13 changed files with 1273 additions and 542 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,4 @@
 __pycache__/
 caldera_esp/confidencial.h
 esp_conf.cfg
 TODO.txt
--- a/232
+++ b/232
@ -0,0 +1,232 @@
 GNU GENERAL PUBLIC LICENSE
 Version 3, 29 June 2007
 Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
 Preamble
 The GNU General Public License is a free, copyleft license for software and other kinds of works.
 The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too.
 When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.
 To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others.
 For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
 Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.
 For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions.
 Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.
 Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.
 The precise terms and conditions for copying, distribution and modification follow.
 TERMS AND CONDITIONS
 0. Definitions.
 “This License” refers to version 3 of the GNU General Public License.
 “Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
 “The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations.
 To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work.
 A “covered work” means either the unmodified Program or a work based on the Program.
 To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.
 To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
 An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
 1. Source Code.
 The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work.
 A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
 The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
 The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.
 The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
 The Corresponding Source for a work in source code form is that same work.
 2. Basic Permissions.
 All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
 You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.
 Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
 No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.
 When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
 4. Conveying Verbatim Copies.
 You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
 You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
 5. Conveying Modified Source Versions.
 You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
     a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
     b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”.
     c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
     d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
 A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
 6. Conveying Non-Source Forms.
 You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
     a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
     b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
     c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
     d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
     e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
 A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
 A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
 “Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
 If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
 The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.
 Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
 7. Additional Terms.
 “Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
 When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
 Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
     a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
     b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
     c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
     d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
     e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
     f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
 All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
 If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
 Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
 8. Termination.
 You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).
 However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
 Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
 Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
 9. Acceptance Not Required for Having Copies.
 You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
 10. Automatic Licensing of Downstream Recipients.
 Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.
 An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
 You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
 11. Patents.
 A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”.
 A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
 Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
 In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
 If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
 If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.
 A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
 Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
 12. No Surrender of Others' Freedom.
 If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
 13. Use with the GNU Affero General Public License.
 Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.
 14. Revised Versions of this License.
 The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
 Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.
 If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
 Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
 15. Disclaimer of Warranty.
 THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
 16. Limitation of Liability.
 IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 17. Interpretation of Sections 15 and 16.
 If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.
 END OF TERMS AND CONDITIONS
 How to Apply These Terms to Your New Programs
 If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
 To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the “copyright” line and a pointer to where the full notice is found.
     <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 <http://www.gnu.org/licenses/>.
 Also add information on how to contact you by electronic and paper mail.
 If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode:
     <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 <http://www.gnu.org/licenses/>.
 The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <http://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/README.md
+++ b/README.md
@ -1,6 +1,197 @@
 # Automatizacion de Caldera
 ***Control de encendido para caldera electrica.***
 Enciende o apaga el termo según configuración. Admite hasta dos horarios de  
 funcionamiento al día, ajustables en **modo 3**.  
 El funcionamiento autonomo es la opción por defecto (**modo 1**).  
 Funcionamiento manual espera instrucción para realizar acción de encendido  
 o apagado (**modo 5**).  
 Hora y fecha ajustables en el **modo 2**.  
 Posiciones del servo al encender o apagar el termo (**modo 4**). Son dos posiciones,  
 ya que el servo realiza movimiento repetitivo para asegurar el accionamiento  
 mecánico del interruptor del termo.  
 El **modo 6** permite mover libremente el servo (desde 16 hasta 144). Útil para probar ajustes.  
 ### Hardware utilizado:
 - [ATmega328p](https://en.wikipedia.org/wiki/Arduino_Nano) (ArduinoNano old bootloader)  
 - [Real time clock](https://en.wikipedia.org/wiki/Real-time_clock) (RTC-DS3231)  
 - [Servo](https://es.wikipedia.org/wiki/Servomotor)  
 - [esp8266](https://en.wikipedia.org/wiki/ESP8266) (ESP01)  
 - [buck converter](https://en.wikipedia.org/wiki/Buck_converter)
 **Arduino** funciona de forma autonoma, no requiere del módulo wifi.  
 **ESP-01** funciona como interface web basica entre el usuario y el puerto serie de arduino.  
 ### Herramientas de control (scripts)
 - [caldera.sh](./scripts/caldera.sh) (bash)
 - [caldera.py](./scripts/caldera.py) (python)
 -----
 ## Arduino
 Control de horario de encendido caldera electrica.  
 Trabaja de forma autonoma y/o comandado por puerto serie (**115200 baudio**).  
 * 3 Modos de Operación
  - Automatizado (1, por defecto)
  - Manual (5)
  - Libre (6)
 * 3 Modos de Configuración
  - Configuración fecha y hora (2)
  - Configuración horas de encendido y apagado (3)
  - Configuración de posiciones de encendido y apagado (4)
 Arduino envia cada segundo los valores actuales de las variables de control al puerto serie.  
 ej: `1,0,5,7,16,18,120,90,45,62,1,42,24,14,7,2021`
 ```
 1____________________________________________ modo
 | 0__________________________________________ estado termo (O=apagado, 1=Encendido)
 | | 5________________________________________ hora de encendido
 | | | 7______________________________________ hora de apagado
 | | | | 16___________________________________ 2da hora de encendido (opcional)
 | | | |  | 18________________________________ 2da hora de apagado (opcional)
 | | | |  |  | 120____________________________ 1ra posicion encendido
 | | | |  |  |  |  90_________________________ 2da posicion encendido
 | | | |  |  |  |  |  45______________________ 1ra posicion apagado
 | | | |  |  |  |  |  |  62___________________ 2da posicion apagado
 | | | |  |  |  |  |  |  |  1_________________ hora en RTC
 | | | |  |  |  |  |  |  |  | 42______________ minutos en RTC
 | | | |  |  |  |  |  |  |  |  | 24___________ segundos en RTC
 | | | |  |  |  |  |  |  |  |  |  | 14________ dia en RTC
 | | | |  |  |  |  |  |  |  |  |  |  | 7______ mes en RTC
 | | | |  |  |  |  |  |  |  |  |  |  | | 2021_ año en RTC
 1,0,5,7,16,18,120,90,45,62,1,42,24,14,7,2021
 ```
 ### Configuración
 Envío de datos a modificar por puerto serie de Arduino (**115200 baudio**).  
 ejemplos:
 - Config. hora **19:35:15** y fecha **19/04/2022**.
  - `2,19,4,2022,19,35,15`
 - Config. horas de funcionamiento de **6 a 8** y **17 a 18 hrs**.
  - `3,6,8,17,18`
 - Config. posiciones de funcionamiento, encendido **120 y 105**, apagado **45 y 62**.
  - `4,120,105,45,62`
 - Cambiar a modo manual y apagar termo.
  - `5,0`
 - Cambiar a modo libre y mover el servo a posición **100**.
  - `6,100`
 - Cambiar a modo autónomo (**modo 1**).
  - `1`
 -----
 ## ESP01
 Establece comunicación serial con arduino (**115200 baudio**).  
 Interface web básica para consulta y configuraciones.  
 Archivo de configuracion ***confidencial.h***  
 ```c
 const char* ssid = "SSID";
 const char* password = "password";
 ```
 #### Urls
 **Consulta valores en arduino**  
 * **/** : muestra valores actuales de variables.
    - ej. `http://192.168.65.10/`
 **Configuración**
 * **/accion** : accionamiento manual, espera argumentos on u off.
    - ej. `http://192.168.65.10/accion?mod=5&acc=on`
 * **/sethora** : configurar de fecha y hora.
    - ej. `http://192.168.65.10/sethora?mod=2&dia=14&mes=7&año=2021&hrs=1&mins=33&segs=24`
 * **/horasAcc** : configurar horas de funcionamiento.
    - ej. `http://192.168.65.10/horasAcc?mod=3&hrOn1=5&hrOff1=7&hrOn2=16&hrOff2=18`
 * **/setservo** : configurar posiciones de encendido y apagado.
    - ej. `http://192.168.65.10/setservo?mod=4&posOn1=110&posOn2=85&posOff1=45&posOff2=62`
 * **/setlibre** : Mover servo libremente (15 < posicion > 165).
    - ej. `http://192.168.65.10/setlibre?mod=6&pos=125`
 * **/auto** : Modo autonomo.
    - ej. `http://192.168.65.10/auto`
 -----
 ## Utilidades  
  Scripts para enviar peticiones web al ESP.
 ### Bash
 [caldera.sh](./scripts/caldera.sh)
 ```
 ==============================
         Estado Termo         
         - ENCENDIDO -        
 ------------------------------
        Modo Automático       
 ------------------------------
     Hora  :   05:12:47
     Fecha :   16/07/2021
 ------------------------------
    Horario Temporizador   
    1)  ON:  5    OFF:  7 
    2)  ON: 16    OFF: 18 
 ==============================
  1) Funcionamiento Autonomo
  2) Ajustar hora y fecha
  3) Ajustar termporizador
  4) Calibrar Servo
  5) Modo Manual
  6) Modo Libre
  0) Salir
  Ingresa Opcion :
 ```
 ### Python
 ***Python >= 3.10***  
 [caldera.py](./scripts/caldera.py)
 ![python_script](./scripts/script_python.png)
 ---- 
 ### Secuencia general
 ```mermaid
 sequenceDiagram
    participant Telegram Bot
    participant Script o web
    participant ESP01
    participant Arduino
    participant Caldera
    Script o web->>ESP01: Consulta/Modifica estado
    Note right of Script o web: control total
    ESP01-->>Script o web: Retorno estado de control
    Telegram Bot->>ESP01: Solicita Encender/Apagar o cambiar a Modo autonomo
    Note right of Telegram Bot: control parcial
    ESP01-->>Telegram Bot: Respuesta
    ESP01->>Arduino: Consulta/Modifica estado
    Arduino-->>ESP01: Retorno estado de control
    Arduino->>Caldera: Enciende o Apaga
 ```
 ---- 
 ### Quick demo v0.2
 <a href="https://www.youtube.com/watch?v=0JR1YQoTmgw" title="quick demo">
  <img src="https://img.youtube.com/vi/0JR1YQoTmgw/hqdefault.jpg" alt="demo" />
 </a>
 > *Como crear un [bot de telegram](https://gitea.kickto.net/jp.av.dev/BotsTelegram_Python/src/branch/master/01-blasterbot)?*  
--- a/caldera_esp/README.md
+++ b/caldera_esp/README.md
@ -1,5 +1,10 @@
-ESP01
+## ESP01
-=====
+
 **Hardware**
 - [ESP01](https://en.wikipedia.org/wiki/ESP8266)
 Interface web básica para consulta y configuraciones.  
 Establece comunicación serial con arduino (**115200 baudio**).  
 Archivo de configuracion ***confidencial.h***  
 ```c
@ -7,19 +12,22 @@ const char* ssid = "SSID";
 const char* password = "password";
 ```
-## Urls
+### Urls
-* '**/**' : muestra valores actuales de variables.
+**Consultar valores en arduino**
-    - ej. http://192.168.65.10/
+* **/** : muestra valores actuales de variables.
-* '**/accion**' : accionamiento manual, espera argumentos on u off.
+    - ej. `http://192.168.65.10/`
-    - ej. http://192.168.65.10/accion?mod=5&acc=on
+
-* '**/sethora**' : configurar de fecha y hora.
+**Configurar**
-    - ej. http://192.168.65.10/sethora?mod=2&dia=14&mes=7&año=2021&hrs=1&mins=33&segs=24 
+* **/accion** : accionamiento manual, espera argumentos on u off.
-* '**/horasAcc**' : configurar horas de funcionamiento.
+    - ej. `http://192.168.65.10/accion?mod=5&acc=on`
-    - ej. http://192.168.65.10/horasAcc?mod=3&hrOn1=5&hrOff1=7&hrOn2=16&hrOff2=18
+* **/sethora** : configurar de fecha y hora.
-* '**/setservo**' : configurar posiciones de encendido y apagado.
+    - ej. `http://192.168.65.10/sethora?mod=2&dia=14&mes=7&año=2021&hrs=1&mins=33&segs=24`
-    - ej. http://192.168.65.10/setservo?mod=4&posOn1=110&posOn2=85&posOff1=45&posOff2=62
+* **/horasAcc** : configurar horas de funcionamiento.
-* '**/setlibre**' : Mover servo libremente (15 < posicion > 165).
+    - ej. `http://192.168.65.10/horasAcc?mod=3&hrOn1=5&hrOff1=7&hrOn2=16&hrOff2=18`
-    - ej. http://192.168.65.10/setlibre?mod=6&pos=125
+* **/setservo** : configurar posiciones de encendido y apagado.
-* '**/auto**' : Modo autonomo.
+    - ej. `http://192.168.65.10/setservo?mod=4&posOn1=110&posOn2=85&posOff1=45&posOff2=62`
-    - ej. http://192.168.65.10/auto
+* **/setlibre** : Mover servo libremente (15 < posicion > 165).
    - ej. `http://192.168.65.10/setlibre?mod=6&pos=125`
 * **/auto** : Modo autonomo.
    - ej. `http://192.168.65.10/auto`
--- a/caldera_esp/caldera_esp.ino
+++ b/caldera_esp/caldera_esp.ino
@ -42,7 +42,7 @@ void handleSEThora() {
        msj_a_arduino += server.arg(4)+",";
        msj_a_arduino += server.arg(5)+",";
        msj_a_arduino += server.arg(6);
-        mensaje_web = "Fecha y hora enviadas a arduino";
+        mensaje_web = "   Fecha y hora enviadas   ";
        Serial.println(msj_a_arduino);
    } else { 
        mensaje_web = "Opcion no valida\n<mod=2&dia= &mes= &año= &hrs= &mins= &segs= >";
@ -58,7 +58,7 @@ void handleHorasAcc() {
        msj_a_arduino += server.arg(2)+",";
        msj_a_arduino += server.arg(3)+",";
        msj_a_arduino += server.arg(4);
-        mensaje_web = "Horas de funcionamiento enviadas a arduino";
+        mensaje_web = " Horas enviadas a arduino  ";
        Serial.println(msj_a_arduino);
    } else { 
        mensaje_web = "Opcion no valida\n<mod=3&hrOn1= &hrOff1= &hrOn2= &hrOff2= >";
@ -74,7 +74,7 @@ void handleSETservo() {
        msj_a_arduino += server.arg(2)+",";
        msj_a_arduino += server.arg(3)+",";
        msj_a_arduino += server.arg(4);
-        mensaje_web = "Posiciones del servo enviadas a arduino";
+        mensaje_web = " Posiciones servo enviadas ";
        Serial.println(msj_a_arduino);
    } else { 
        mensaje_web = "Opcion no valida\n<mod=4&posOn1= &posOn2= &posOff1= &posOff2= >";
@ -87,7 +87,7 @@ void handleSETlibre() {
    if(server.arg(0) == "6") {
        msj_a_arduino = "6,";
        msj_a_arduino += server.arg(1);
-        mensaje_web = "Posicion del servo enviada a arduino";
+        mensaje_web = "Posicion del servo enviada ";
        Serial.println(msj_a_arduino);
    } else {
        mensaje_web = "Opcion no valida\n<mod=6&posServ= >";
@ -98,7 +98,7 @@ void handleSETlibre() {
 void handleSETauto() {
    String mensaje_web, msj_a_arduino;
    msj_a_arduino = "1";
-    mensaje_web = "Enviando modo 1 (Autonomo) a arduino";
+    mensaje_web = "Enviando modo 1 (Autonomo) ";
    Serial.println(msj_a_arduino);
    server.send(200, "text/plain", mensaje_web);
 }
--- a/caldera_rata/README.md
+++ b/caldera_rata/README.md
@ -1,36 +1,77 @@
-## Control de horarios de encendido caldera electrica
+## Control de encendido para caldera electrica
-Trabaja de forma autonoma y/o comandado por puerto serie
+**Hardware**
-
+- [ATmega328p](https://en.wikipedia.org/wiki/Arduino_Nano) (ArduinoNano old bootloader)  
-### 3 Modos de Operación
+- [Real time clock](https://en.wikipedia.org/wiki/Real-time_clock) (RTC-DS3231)  
-    1) Automatizado (por defecto)
+- [Servo](https://es.wikipedia.org/wiki/Servomotor)  
    5) Manual
    6) Libre
 3 Modos de Configuracion
    2) Configuracion de fecha y hora
    3) Configuracion horas de encendido y apagado
    4) Configuracion de posiciones de encendido y apagado
-Arduino envia cada segundo los valores actuales de las variables de control.
+Enciende o apaga el termo según configuración. Admite hasta dos horarios  
 de funcionamiento al día, ajustables en **modo 3**.  
 El funcionamiento autonomo es la opción por defecto (**modo 1**).  
 Funcionamiento manual espera instrucción para realizar acción de encendido  
 o apagado (**modo 5**).  
 Hora y fecha ajustables en el **modo 2**.  
 Posiciones del servo al encender o apagar el termo (**modo 4**). Son dos posiciones,  
 ya que el servo realiza movimiento repetitivo para asegurar el accionamiento  
 mecánico del interruptor del termo.  
 El **modo 6** permite mover libremente el servo (desde 16 hasta 144). Útil para probar ajustes.  
 ## Arduino
 Control de horario de encendido caldera electrica.  
 Trabaja de forma autonoma y/o comandado por puerto serie (**115200 baudio**).  
 * 3 Modos de Operación
  - Automatizado (**1**, por defecto)
  - Manual (**5**) 
  - Libre (**6**)
 * 3 Modos de Configuración
  - Configuración fecha y hora (**2**)
  - Configuración horas de encendido y apagado (**3**)
  - Configuración de posiciones de encendido y apagado (**4**)
 Arduino envia cada segundo los valores actuales de las variables de control al puerto serie.  
 ej: `1,0,5,7,16,18,120,90,45,62,1,42,24,14,7,2021`
 ```
-ej.
+1____________________________________________ modo
-1,0,5,7,16,18,120,90,45,62,1,42,24,14,7,2021
+| 0__________________________________________ estado termo (O=apagado, 1=Encendido)
-
+| | 5________________________________________ hora de encendido
-1 > modo, 
+| | | 7______________________________________ hora de apagado
-| 0 > estado termo (O = apagado, 1 = Encendido)
+| | | | 16___________________________________ 2da hora de encendido (opcional)
-| | 5 > hora de encendido
+| | | |  | 18________________________________ 2da hora de apagado (opcional)
-| | | 7 > hora de apagado
+| | | |  |  | 120____________________________ 1ra posicion encendido
-| | | | 16 > 2da hora de encendido (opcional)
+| | | |  |  |  |  90_________________________ 2da posicion encendido
-| | | |  | 18 > 2da hora de apgado (opcional)
+| | | |  |  |  |  |  45______________________ 1ra posicion apagado
-| | | |  |  | 120 > 1ra posicion encendido
+| | | |  |  |  |  |  |  62___________________ 2da posicion apagado
-| | | |  |  |  |  90 > 2ra posicion encendido
+| | | |  |  |  |  |  |  |  1_________________ hora en RTC
-| | | |  |  |  |  |  45 > 1ra posicion apagado
+| | | |  |  |  |  |  |  |  | 42______________ minutos en RTC
-| | | |  |  |  |  |  |  62 > 2ra posicion apagado
+| | | |  |  |  |  |  |  |  |  | 24___________ segundos en RTC
-| | | |  |  |  |  |  |  |  1 > hora en RTC
+| | | |  |  |  |  |  |  |  |  |  | 14________ dia en RTC
-| | | |  |  |  |  |  |  |  | 42 > minutos en RTC
+| | | |  |  |  |  |  |  |  |  |  |  | 7______ mes en RTC
-| | | |  |  |  |  |  |  |  |  | 24 > segundos en RTC
+| | | |  |  |  |  |  |  |  |  |  |  | | 2021_ año en RTC
 | | | |  |  |  |  |  |  |  |  |  | 14 > dia en RTC
 | | | |  |  |  |  |  |  |  |  |  |  | 7 > mes en RTC
 | | | |  |  |  |  |  |  |  |  |  |  | | 2021 > año en RTC
 1,0,5,7,16,18,120,90,45,62,1,42,24,14,7,2021
 ```
 ### Configuración
 Envío de datos a modificar por puerto serie de Arduino (**115200 baudio**).  
 ejemplos:
 - Config. hora **19:35:15** y fecha **19/04/2022**.
  - `2,19,4,2022,19,35,15`
 - Config. horas de funcionamiento de **6 a 8** y **17 a 18 hrs**.
  - `3,6,8,17,18`
 - Config. posiciones de funcionamiento, encendido **120 y 105**, apagado **45 y 62**.
  - `4,120,105,45,62`
 - Cambiar a modo manual y apagar termo.
  - `5,0`
 - Cambiar a modo libre y mover el servo a posición **100**.
  - `6,100`
 - Cambiar a modo autónomo (**modo 1**).
  - `1`
--- a/caldera_rata/caldera_rata.ino
+++ b/caldera_rata/caldera_rata.ino
@ -31,7 +31,7 @@ byte posOFF2;
 byte posTEMP;
 byte cont;
 bool estado_termo;
-bool espera;
+bool sentido;
 bool espera_man;
 bool start;
 byte manual;
@ -180,28 +180,21 @@ void limpiaSerial() {
 void termoACC(byte pos1, byte pos2) {
    myservo_X.write(pos1);
-    espera=0;
+    sentido=0;
    cont=0;
    previoMillisTermo=millis();
    do{
        actualMillis=millis();
        if(espera==0) {
        if ((unsigned long)(actualMillis - previoMillisTermo) >= 500) {
            if(sentido==0) {
                myservo_X.write(pos2);
-                espera=1;
+            } else {
                cont++;
                previoMillisTermo=millis();
            }
        }
        actualMillis=millis();
        if(espera==1) {
            if ((unsigned long)(actualMillis - previoMillisTermo) >= 500) {
                myservo_X.write(pos1);
-                espera=0;
+            }
            sentido=!sentido;
            cont++;
            previoMillisTermo=millis();
        }
        }
    } while (cont<4);
 }
--- a/caldera_rata_deb/caldera_rata_deb.ino
+++ b/caldera_rata_deb/caldera_rata_deb.ino
@ -1,374 +0,0 @@
 #include <Servo.h>
 #include <RTClib.h>
 #include <EEPROM.h>
 #define dirHoraON1 0
 #define dirHoraOFF1 1
 #define dirHoraON2 2
 #define dirHoraOFF2 3
 #define dirPosON1 4
 #define dirPosON2 5
 #define dirPosOFF1 6
 #define dirPosOFF2 7
 Servo myservo_X;
 RTC_DS3231 reloj;
 volatile DateTime fecha;
 unsigned long intervalo_loop=100;
 unsigned long previoMillisLoop=0;
 unsigned long previoMillisTermo=0;
 unsigned long previoMillisAUTO=0;
 unsigned long actualMillis;
 byte horaON1;
 byte horaOFF1;
 byte horaON2;
 byte horaOFF2;
 byte posON1;
 byte posON2;
 byte posOFF1;
 byte posOFF2;
 byte posTEMP;
 byte cont;
 bool estado_termo;
 bool espera;
 bool espera_man;
 bool start;
 byte manual;
 byte estado;
 byte hr, mn, sg, di, me;
 int an;
 void setup() {
    Serial.begin(9600);
    myservo_X.attach(9);
    reloj.begin();
    estado=1;
    estado_termo=0;
    start=1;
    //ajustaReloj(2021, 7, 8, 4, 59, 50);
    //reloj.adjust(DateTime(__DATE__, __TIME__));
 }
 void loop() {
    if(start) {
        myservo_X.write(30);
        fecha=reloj.now();
        cargarVarsControl();
        start=0;
    }
    actualMillis = millis();
    if ((unsigned long)(actualMillis - previoMillisLoop) >= intervalo_loop) {
        printFecha();
        printVars();
        fecha = reloj.now();
        switch(estado) {
            case 1:
                if ((unsigned long)(actualMillis - previoMillisAUTO) >= 2000) {
                    Serial.println(estado);
                    if((((fecha.hour() >= horaON1)   && (fecha.hour() < horaOFF1)) ||
                        ((fecha.hour() >= horaON2) && (fecha.hour() < horaOFF2))) && (estado_termo==0)) {
                        termoACC(posON1, posON2);
                        Serial.println("TERMO ON");
                    } else if((((fecha.hour() < horaON1)   || (fecha.hour() >= horaOFF1)) && 
                               ((fecha.hour() < horaON2) || (fecha.hour() >= horaOFF2))) && (estado_termo==1)) {
                        termoACC(posOFF1, posOFF2);
                        Serial.println("TERMO OFF");
                    }
                }
                previoMillisAUTO = millis();
                break;
            case 2:
                // ajustaReloj
                setVarsEP();
                estado = 1;
                break;
            case 3:
                // ajuste horas de funcionamiento
                setVarsEP();
                cargarVarsControl();
                estado = 1;
                break;
            case 4:
                // ajustaPosServo
                setVarsEP();
                cargarVarsControl();
                estado = 1;
                break;
            case 5:
                if(espera_man) {
                    if(manual == 1) {
                        termoACC(posON1, posON2);
                    } else if (manual == 0){
                        termoACC(posOFF1, posOFF2);
                    }
                    espera_man=0;
                }
                break;
            case 6:
                if(validaPOS(posTEMP)) {
                    myservo_X.write(posTEMP);
                    estado_termo=0;
                }
                // debe reaccionar a los parametros enviados por Serial
                // movimiento libre, termoACC, ajustaReloj, configs, etc.
                break;
            default:
                estado=1;
        }
        leerDatos();
        previoMillisLoop = millis();
    }
 }
 void leerDatos() {
    if (Serial.available() > 0) {
        byte temp_var=0;
        temp_var = Serial.readStringUntil(',').toInt();
        if(temp_var < 7 && temp_var > 0){
            estado = temp_var;
        } else {
            estado = 1;
        }
        switch (estado) {
            case 1:
                limpiaSerial(); 
                break;
            case 2:
                di = Serial.readStringUntil(',').toInt();
                me = Serial.readStringUntil(',').toInt();
                an = Serial.readStringUntil(',').toInt();
                hr = Serial.readStringUntil(',').toInt();
                mn = Serial.readStringUntil(',').toInt();
                sg = Serial.readStringUntil(',').toInt();
                Serial.print("Datos leidos :"+(String)di+"/"+(String)me+"/"+(String)an+" "+(String)hr+":"+(String)mn+":"+(String)sg);
                break;
            case 3:
                horaON1 = Serial.readStringUntil(',').toInt();
                horaOFF1 = Serial.readStringUntil(',').toInt();
                horaON2 = Serial.readStringUntil(',').toInt();
                horaOFF2 = Serial.readStringUntil(',').toInt();
                break;
            case 4:
                posON1 = Serial.readStringUntil(',').toInt();
                posON2 = Serial.readStringUntil(',').toInt();
                posOFF1 = Serial.readStringUntil(',').toInt();
                posOFF2 = Serial.readStringUntil(',').toInt();
                break;
            case 5:
                manual = Serial.readStringUntil(',').toInt();
                espera_man = 1;
                break;
            case 6:
                posTEMP = Serial.readStringUntil(',').toInt();
                break;
            default:
                limpiaSerial();
        }
        limpiaSerial();
    } else {
        Serial.println("Nada q hacer");
    }
 }
 void limpiaSerial() {
    while(Serial.available() > 0) {
        char temp = Serial.read();
    }
 }
 //como bash: cut -d
 //String getValue(String data, char separator, int index){
 //    int found = 0;
 //    int strIndex[] = { 0, -1 };
 //    int maxIndex = data.length() - 1;
 //    for (int i = 0; i <= maxIndex && found <= index; i++) {
 //        if (data.charAt(i) == separator || i == maxIndex) {
 //            found++;
 //            strIndex[0] = strIndex[1] + 1;
 //            strIndex[1] = (i == maxIndex) ? i+1 : i;
 //        }
 //    }
 //    return found > index ? data.substring(strIndex[0], strIndex[1]) : "";
 //}
 void termoACC(byte pos1, byte pos2) {
    myservo_X.write(pos1);
    espera=0;
    cont=0;
    previoMillisTermo=millis();
    do{
        actualMillis=millis();
        if(espera==0) {
            if ((unsigned long)(actualMillis - previoMillisTermo) >= 500) {
                myservo_X.write(pos2);
                espera=1;
                cont++;
                previoMillisTermo=millis();
            }
        }
        actualMillis=millis();
        if(espera==1) {
            if ((unsigned long)(actualMillis - previoMillisTermo) >= 500) {
                myservo_X.write(pos1);
                espera=0;
                cont++;
                previoMillisTermo=millis();
            }
        }
    } while (cont<4);
    estado_termo=!estado_termo;
 }
 void setVarsEP(){
    switch (estado) {
        case 2:
            ajustaReloj(an, me, di, hr, mn, sg);
            break;
        case 3:
            if(validaHR(horaON1)) {
                EEPROM.put(dirHoraON1, horaON1);
            } else {
                horaON1 = EEPROM.read(dirHoraON1);
            }
            if(validaHR(horaOFF1) && horaOFF1 > horaON1) {
                EEPROM.put(dirHoraOFF1, horaOFF1);
            } else {
                EEPROM.put(dirHoraOFF1, horaON1 + 1);
                horaOFF1 = EEPROM.read(dirHoraOFF1);
            }
            if(validaHR(horaON2) && horaON2 > horaOFF1) {
                EEPROM.put(dirHoraON2, horaON2);
            } else if(validaHR(horaON1)) {
                EEPROM.put(dirHoraON2, horaON1);
                EEPROM.put(dirHoraOFF2, horaOFF1);
                horaON2 = EEPROM.read(dirHoraON2);
                horaOFF2 = EEPROM.read(dirHoraOFF2);
            }
            if(validaHR(horaOFF2) && (horaOFF2 > horaON2) && (horaOFF2 > horaOFF1)) {
                EEPROM.put(dirHoraOFF2, horaOFF2);
            } else {
                EEPROM.put(dirHoraON2, horaON1);
                EEPROM.put(dirHoraOFF2, horaOFF1);
            }
            break;
        case 4:
            if(validaPOS(posON1)) {
                EEPROM.put(dirPosON1, posON1);
            }
            if(validaPOS(posON2)) {
                EEPROM.put(dirPosON2, posON2);
            }
            if(validaPOS(posOFF1)) {
                EEPROM.put(dirPosOFF1, posOFF1);
            }
            if(validaPOS(posOFF2)) {
                EEPROM.put(dirPosOFF2, posOFF2);
            }
            break;
        default:
            Serial.print("default setVarsEP");
    }
 }
 bool validaHR(byte hr) {
    return (hr < 24 && hr >= 0);
 }
 bool validaPOS(byte pos) {
    return (pos < 165) && (pos >15);
 }
 void cargarVarsControl() {
    horaON1 = EEPROM.read(dirHoraON1);
    horaOFF1 = EEPROM.read(dirHoraOFF1);
    horaON2 = EEPROM.read(dirHoraON2);
    horaOFF2 = EEPROM.read(dirHoraOFF2);
    posON1 = EEPROM.read(dirPosON1);
    posON2 = EEPROM.read(dirPosON2);
    posOFF1 = EEPROM.read(dirPosOFF1);
    posOFF2 = EEPROM.read(dirPosOFF2);
 }
 void ajustaReloj(int ano, byte mes, byte dia, byte hra, byte mins, byte segs ) {
    if((ano > 2000) && 
       (mes > 0 && mes < 13) && 
       (dia > 0 && dia < 32) && 
       (hra >= 0 && hra < 24) && 
       (mins >= 0 && mins < 60) && 
       (segs >= 0 && segs < 60)) {
        DateTime dt(ano, mes, dia, hra, mins, segs);
        reloj.adjust(dt);
        Serial.println("Set RTC: valido");
    } else {
        Serial.println("Set RTC: invalido");
    }
 }
 //En caso de ser necesario mostrar hora, este codigo añade un 0 a los valores menores a 10
 String getHora(char var) {
  switch (var) {
    case 'h':
      if(fecha.hour() < 10) {
        return ('0'+(String)fecha.hour()); break;
        } else {
          return (String)fecha.hour();break;
        }
    case 'm':
      if(fecha.minute() <10) {
        return ('0'+(String)fecha.minute()); break;
        } else {
          return (String)fecha.minute();break;
      }
    case 's':
      if(fecha.second() <10) {
        return ('0'+(String)fecha.second()); break;
        } else {
          return (String)fecha.second();break;
      }
    case 'd':
      if(fecha.day() <10) {
        return ('0'+(String)fecha.day()); break;
        } else {
          return (String)fecha.day();break;
      }
    case 'n':
      if(fecha.month() <10) {
        return ('0'+(String)fecha.month()); break;
        } else {
          return (String)fecha.month();break;
      }
    case 'a':
      if(fecha.year() <10) {
        return ('0'+(String)fecha.year()); break;
        } else {
          return (String)fecha.year();break;
      }
  }
 }
 // Enviar hora y fecha por puerto serie
 void printFecha() {
  Serial.print(getHora('d'));
  Serial.print("/");
  Serial.print(getHora('n'));
  Serial.print("/");
  Serial.print(getHora('a'));
  Serial.print("  ");
  Serial.print(getHora('h'));
  Serial.print(":");
  Serial.print(getHora('m'));
  Serial.print(":");
  Serial.print(getHora('s'));
  Serial.print(" Día de la semana: ");
  Serial.println((String)fecha.dayOfTheWeek());
 }
 void printVars() {
    Serial.println("Variables: "+(String)horaON1+", "+(String)horaOFF1+", "+
                                 (String)horaON2+", "+(String)horaOFF2+", "+
                                 (String)posON1+", "+(String)posON2+", "+
                                 (String)posOFF1+", "+(String)posOFF2);
 }
--- a/scripts/README.md
+++ b/scripts/README.md
@ -0,0 +1,74 @@
 # Utilidades  
  Scripts para enviar peticiones web al ESP.
 ## Bash
 ```
 ─ 📂️ scripts
  ├── 📄️ caldera.sh
  └── 📄️ esp_conf.cfg
 ```
 Archivo de configuración
 ***./esp_conf.cfg***
 ```cfg
 [esp01]
 URL = <direcion_ESP>
 ```
 Dependencias
 - curl
 - grep
 - cut
 Correr: `  ./caldera.sh  `
 ```
 ==============================
         Estado Termo         
         - ENCENDIDO -        
 ------------------------------
        Modo Automático       
 ------------------------------
     Hora  :   05:12:47
     Fecha :   16/07/2021
 ------------------------------
    Horario Temporizador   
    1)  ON:  5    OFF:  7 
    2)  ON: 16    OFF: 18 
 ==============================
  1) Funcionamiento Autonomo
  2) Ajustar hora y fecha
  3) Ajustar termporizador
  4) Calibrar Servo
  5) Modo Manual
  6) Modo Libre
  0) Salir
  Ingresa Opcion :
 ```
 ----
 ## Python
 versión ***Python >= 3.10***  
 ```
 ─ 📂️ scripts
  ├── 📄️ caldera.py
  ├── 📄️ esp_conf.cfg
  └── 📄️ vista_term.py
 ```
 Archivo de configuración
 ***./esp_conf.cfg***
 ```cfg
 [esp01]
 URL = <direcion_ESP>
 ```
 Dependencias:
 - requests
 - colorama
 Correr: ` ./caldera.py ` o ` python caldera.py `
 ![python_script](./script_python.png)
--- a/scripts/caldera.py
+++ b/scripts/caldera.py
@ -0,0 +1,174 @@
 #!/usr/bin/env python3.10
 """
    Script de control Caldera automatizada [Arduino]+[ESP01]
 """
 import os
 import sys
 from time import sleep
 import configparser as cfg
 import vista_term as vt
 try:
    parser = cfg.ConfigParser()
    parser.read('esp_conf.cfg')
    ESP01 = parser.get('esp01', 'URL')
 except cfg.Error as ex:
    print('Error al leer archivo de configuración\n', ex)
    sys.exit()
 try:
    import requests
 except ModuleNotFoundError as ex:
    print("Debes instalar los modulos necesarios\n", ex)
    sys.exit()
 clear = lambda: os.system('clear') if os.name == 'posix' else os.system('cls')
 def enviar_consulta(consulta):
    """Retorna la respuesta a la petición GET *consulta*
    :consulta: str ( consulta creada por consultas() )
    :returns: str ( respuesta del GET request )
    """
    resp = requests.get(consulta)
    return resp.text
 def consultas(modo, id_modo='', datos=['']):
    """Crea la petición GET según si los datos son list o str
    Retorna la respuesta de enviar_consulta()
    :modo: str (sub-menu)
    :id_modo: str (id modo de operacion)
    :datos: list[str] | str
    :returns: str (respuesta del GET request)
    """
    if id_modo != '':
        modo = modo + '?1=' + id_modo
    orden = ''
    cont = 2
    if type(datos) is list:
        if len(datos) == 1:
            orden = ''
        else:
            for dato in datos:
                if dato != '':
                    orden += '&' + str(cont) + '=' + str(dato)
                    cont += 1
    else:
        orden += '&' + str(cont) + '=' + str(datos)
    resp = enviar_consulta(ESP01 + modo + orden)
    return resp
 intentos=0
 def datos_a_lista() -> list[str] : 
    """Retorna el str recibido de consultas() como una lista, valida el largo
    de la lista, añade 0 o ' ' a valores, según sea necesario para el correcto
    formateo del texto a mostrar.
    :returns: list[str] ( len(list) = 16 )
    """
    datos = []
    global intentos
    while True:
        try:
            resp = consultas('')
            for var in resp.split(','):
                datos.append(var)
            assert len(datos) == 16
            for i in range(10,15):
                if int(datos[i]) < 10:
                    datos[i] = '0'+datos[i]
            for i in range(2,6):
                if int(datos[i]) < 10:
                    datos[i] = ' '+datos[i]
            intentos = 0
            return datos
        except KeyboardInterrupt:
            sys.exit()
        except AssertionError:
            vt.resp_conex('assert', intentos)
            intentos += 1
            sleep(5)
        except ConnectionError:
            vt.resp_conex('conexion', intentos)
            intentos += 1
            sleep(5)
        except OSError:
            vt.resp_conex('oserror', intentos)
            intentos += 1
            sleep(2)
        if intentos > 2:
            vt.resp_conex()
            sys.exit()
 def main():
    global intentos
    while True:
        # Lista con valores de los datos recibidos
        vals = datos_a_lista() 
        clear()
        vt.pant_principal(vals[0], vals[1], vals[10:16], vals[2:6])
        modo_user = vt.entrada_usuario()
        match modo_user:
            case 's':
                sys.exit()
            case '1':
                #vt.pant_test_valores(vals)
                vt.respuesta_config(consultas('/auto'))
                intentos = 0
                sleep(7)
            case'2':
                vt.pant_config_fecha(vals[10:16])
                resp_user = vt.entrada_usuario('/sethora')
                vt.respuesta_config(consultas('/sethora', modo_user, resp_user))
                intentos = 0
                sleep(5)
            case '3':
                vt.pant_termporizador(vals[2:6])
                resp_user = vt.entrada_usuario('/horasAcc')
                vt.respuesta_config(consultas('/horasAcc', modo_user, resp_user))
                intentos = 0
                sleep(5)
            case '4':
                pos_servo = []
                for val in vals[6:10]:
                    if int(val) < 100:
                        pos_servo.append(' '+val)
                    else:
                        pos_servo.append(val)
                vt.pant_posic_servo(pos_servo)
                resp_user = vt.entrada_usuario('/setservo')
                vt.respuesta_config(consultas('/setservo', modo_user, resp_user))
                intentos = 0
                sleep(5)
            case '5':
                vt.pant_accion_manual(vals[1])
                resp_user = vt.entrada_usuario('/accion')
                vt.respuesta_config(consultas('/accion', modo_user, resp_user))
                intentos = 0
                sleep(7)
            case '6':
                vt.pant_servo_manual()
                resp_user = vt.entrada_usuario('/setlibre')
                vt.respuesta_config(consultas('/setlibre', modo_user, resp_user))
                intentos = 0
                sleep(5)
            case '':
                vt.respuesta_info()
                sleep(1.5)
            case 'v':
                vt.respuesta_info('volver')
                intentos = 0
                sleep(1.5)
            case _:
                modo_user = vt.entrada_usuario()
                vt.respuesta_info('error')
                sleep(1.5)
 if __name__ == "__main__":
    main()
--- a/scripts/caldera.sh
+++ b/scripts/caldera.sh
@ -1,110 +1,76 @@
-#!/bin/bash
+#!/usr/bin/env bash
-IP_CALDERA="<IP_ESP01>"
+IP_CALDERA="$(grep URL esp_conf.cfg | cut -d'=' -f2)"
 estado_caldera() {
    RESP=$(curl -s ${IP_CALDERA})
-    MODO=$(echo ${RESP} | cut -d',' -f 1)
+    arRS=(${RESP//,/ })
-    ESTADO=$(echo ${RESP} | cut -d',' -f 2)
+    echo "=============================="
    HR_ON1=$(echo ${RESP} | cut -d',' -f 3)
    HR_OFF1=$(echo ${RESP} | cut -d',' -f 4)
    HR_ON2=$(echo ${RESP} | cut -d',' -f 5)
    HR_OFF2=$(echo ${RESP} | cut -d',' -f 6)
    POS_ON1=$(echo ${RESP} | cut -d',' -f 7)
    POS_ON2=$(echo ${RESP} | cut -d',' -f 8)
    POS_OFF1=$(echo ${RESP} | cut -d',' -f 9)
    POS_OFF2=$(echo ${RESP} | cut -d',' -f 10)
    HRA=$(echo ${RESP} | cut -d',' -f 11)
    MIN=$(echo ${RESP} | cut -d',' -f 12)
    SEG=$(echo ${RESP} | cut -d',' -f 13)
    DIA=$(echo ${RESP} | cut -d',' -f 14)
    MES=$(echo ${RESP} | cut -d',' -f 15)
    ANO=$(echo ${RESP} | cut -d',' -f 16)
    echo "============================="
    echo "         Estado Termo         "
-    [[ ${ESTADO} = "1" ]] && echo "   - ENCENDIDO -"
+    [[ ${arRS[1]} = "1" ]] && echo "         - ENCENDIDO -        "
-    [[ ${ESTADO} = "0" ]] && echo "   -  APAGADO  -"
+    [[ ${arRS[1]} = "0" ]] && echo "         -  APAGADO  -        "
-    echo -e "-----------------------------"
+    echo "------------------------------"
-    case $MODO in
+    case ${arRS[0]} in
-        '1')
+        '1')    echo "        Modo Automático       "   ;;
-            echo "  Modo Automático"
+        '5')    echo "          Modo Manual         "   ;;
-            ;;
+        '6')    echo "          Modo Libre          "   ;;
-        '5')
+        *)      echo "      verificar conexión!     "   ;;
            echo "  Modo Manual (esperando orden)"
            ;;
        '6')
            echo "  Modo Libre"
            ;;
        *)
            echo "  verificar conexión!"
            ;;
    esac
-    echo "  Hora : ${HRA}:${MIN}:${SEG}"
+    echo "------------------------------"
-    echo "  Fecha: ${DIA}/${MES}/${ANO}"
+    for i in {10..14}; do [[ ${arRS[${i}]} -lt 10 ]] && arRS[${i}]="0"${arRS[${i}]}; done
-    echo -e "-------------------------------"
+    echo "     Hora  :   ${arRS[10]}:${arRS[11]}:${arRS[12]}"
-    echo " 1ra Hora de encend.  : ${HR_ON1} hrs"
+    echo "     Fecha :   ${arRS[13]}/${arRS[14]}/${arRS[15]}"
-    echo " 1ra Hora de apagado  : ${HR_OFF1} hrs"
+    echo "------------------------------"
-    echo " 2ra Hora de encend.  : ${HR_ON2} hrs"
+    for i in {2..5}; do [[ ${arRS[${i}]} -lt 10 ]] && arRS[${i}]=" "${arRS[${i}]}; done
-    echo " 2ra Hora de apagado  : ${HR_OFF2} hrs"
+    echo "    Horario Temporizador   "
-    echo -e "-------------------------------"
+    echo "    1)  ON: ${arRS[2]}    OFF: ${arRS[3]} "
-    echo " 1ra Posición encendido: ${POS_ON1}"
+    echo "    2)  ON: ${arRS[4]}    OFF: ${arRS[5]} "
-    echo " 2da Posición encendido: ${POS_ON2}"
+    echo -e "==============================\n"
    echo " 1ra Posición apagado  : ${POS_OFF1}"
    echo " 2da Posición apagado  : ${POS_OFF2}"
    #echo -e "-----------------------------\n"
    echo -e "=============================\n"
 }
 ejec_orden() {
    ORD=""
    case $1 in
-        2)
+        2)  ORD="/sethora?1=2&2=${2}&3=${3}&4=${4}&5=${5}&6=${6}&7=${7}"    ;;
-            ORD="/sethora?1=2&2=${2}&3=${3}&4=${4}&5=${5}&6=${6}&7=${7}"
+        3)  ORD="/horasAcc?1=3&2=${2}&3=${3}&4=${4}&5=${5}" ;;
-            ;;
+        4)  ORD="/setservo?1=4&2=${2}&3=${3}&4=${4}&5=${5}" ;;
-        3)
+        5)  if [ -n ${2} ]; then
-            ORD="/horasAcc?1=3&2=${2}&3=${3}&4=${4}&5=${5}"
+                if [ ${2} = "on" ]; then
            ;;
        4)
            ORD="/setservo?1=4&2=${2}&3=${3}&4=${4}&5=${5}"
            ;;
        5)
            if [ ${2} = "on" ]
            then
                    ORD="/accion?1=5&2=on"
-            elif [ ${2} = "off" ]
+                elif [ ${2} = "off" ]; then
            then
                    ORD="/accion?1=5&2=off"
                fi
-            ;;
+            else 
-        6)
+                return
-            ORD="/setlibre?1=6&2=${1}"
+            fi  ;;
-            ;;
+        6)  ORD="/setlibre?1=6&2=${1}"  ;;
-        *)
+        *)  ORD=""  ;;
            ORD=""
            ;;
      esac
-      curl -s "${IP_CALDERA}${ORD}"
+      curl ${IP_CALDERA}${ORD}
 }
 principal() {
    clear
    estado_caldera
    echo "  1) Funcionamiento Autonomo"
-    echo "  2) Configurar hora y fecha"
+    echo "  2) Ajustar hora y fecha"
-    echo "  3) Conf. hrs. de funcionamiento"
+    echo "  3) Ajustar termporizador"
-    echo "  4) Conf. posiciones de func."
+    echo "  4) Calibrar Servo"
-    echo "  5) Modo manual"
+    echo "  5) Modo Manual"
-    echo "  6) Modo libre"
+    echo "  6) Modo Libre"
    echo "  0) Salir"
    echo 
    read -p "  Ingresa Opcion :" OPC
    case ${OPC} in
-        "1")
+        "1")    echo; curl -s ${IP_CALDERA}'/auto'  ;;
            curl -s "${IP_CALDERA}/auto"
            ;;
        "2")
-            echo "______________________________"
+            clear
-            echo " Configuracion de fecha y hora"
+            echo "============================"
            echo "  Valores Actuales en RTC    "
            echo "    Hora  :   ${arRS[10]}:${arRS[11]}:${arRS[12]}"
            echo "    Fecha :   ${arRS[13]}/${arRS[14]}/${arRS[15]}"
            echo -e "============================\n"
            echo -e " Configuracion fecha y hora \n"
            read -p "ingresa el DIA: " DIA
            read -p "ingresa el MES: " MES
            read -p "ingresa el AÑO: " ANO
@ -114,8 +80,13 @@ principal() {
            ejec_orden 2 ${DIA} ${MES} ${ANO} ${HRA} ${MIN} ${SEG}
            ;;
        "3")
-            echo "______________________________"
+            clear
-            echo " Conf. horas de funcionamiento"
+            echo -e "=============================="
            echo "    Horario Temporizador   "
            echo "    1)  ON: ${arRS[2]}    OFF: ${arRS[3]} "
            echo "    2)  ON: ${arRS[4]}    OFF: ${arRS[5]} "
            echo -e "==============================\n"
            echo -e "  ingresa nuevo horario  \n"
            read -p " 1ra hora de encendido: " HR_ON1
            read -p " 1ra hora de apagado  : " HR_OFF1
            echo " opcional"
@ -124,29 +95,48 @@ principal() {
            ejec_orden 3 ${HR_ON1} ${HR_OFF1} ${HR_ON2} ${HR_OFF2}
            ;;
        "4")
-            echo "______________________________"
+            for i in {6..9}; do [[ ${arRS[${i}]} -lt 100 ]] && arRS[${i}]=" "${arRS[${i}]}; done
-            echo " Conf. posiciones del servo"
+            clear
            echo -e "============================"
            echo "    Configuración actual     "
            echo "----------------------------"
            echo "  1ra Posicion ON  : ${arRS[6]}"
            echo "  2da Posición ON  : ${arRS[7]}"
            echo "----------------------------"
            echo "  1ra Posición OFF : ${arRS[8]}"
            echo "  2da Posición OFF : ${arRS[9]}"
            echo -e "============================\n"
            echo -e "     Ingresar  valores      \n"
            read -p " 1ra posición encendido: " POS_ON1
            read -p " 2ra posición encendido: " POS_ON2
            read -p " 1ra posición apagado: " POS_OFF1
            read -p " 2ra posición apagado: " POS_OFF2
            echo
            ejec_orden 4 ${POS_ON1} ${POS_ON2} ${POS_OFF1} ${POS_OFF2}
            ;;
        "5")
-            echo "_______________________" 
+            clear
-            echo " Funcionamiento Manual "
+            echo -e "============================\n"
-            read -p " Encender o apagar (on/off) :" MANUAL
+            echo -e "    Accionamiento Manual    "
            [[ ${arRS[1]} = "1" ]] && echo "        - ENCENDIDO -        "
            [[ ${arRS[1]} = "0" ]] && echo "        -  APAGADO  -        "
            echo -e "============================\n"
            echo -e " Encender o apagar (on/off)\n" 
            read -p " :" MANUAL
            echo
            ejec_orden 5 ${MANUAL}
            ;;
        "6")
-            echo "__________________" 
+            clear
-            echo " Movimiento libre "
+            echo -e "============================\n"
-            read -p " ingresa posición (15<165):" MANUAL
+            echo -e "      Movimiento libre      \n"
            echo -e "============================\n"
            echo " ingresa posición (15<165):"
            read -p " :" MANUAL
            echo
            ejec_orden 6 ${MANUAL}
            ;;
-        "0")
+        "0")    exit    ;;
            exit
            ;;
    esac
 sleep 8
 principal
--- a/scripts/script_python.png
+++ b/scripts/script_python.png
--- a/scripts/vista_term.py
+++ b/scripts/vista_term.py
@ -0,0 +1,399 @@
 """
    Gestión de pantallas (dialogos, opcs, menus, etc) y entradas de usuario.
 """
 import os
 import sys
 from time import sleep
 from caldera import main
 try:
    from colorama import Fore, Back, Style
 except ModuleNotFoundError as ex:
    print("Debes instalar los modulos necesarios\n")
    print(ex)
    sleep(2)
    sys.exit()
 clear = lambda: os.system('clear') if os.name == 'posix' else os.system('cls')
 # Colores
 col_rst      = Style.RESET_ALL
 col_menu     = Fore.BLACK+Back.LIGHTBLACK_EX+Style.DIM
 col_head     = Fore.BLUE+Back.LIGHTWHITE_EX+Style.NORMAL
 col_headGrn  = Fore.GREEN+Back.MAGENTA+Style.BRIGHT
 col_headRed  = Fore.RED+Back.BLUE+Style.DIM
 col_headLred = Fore.LIGHTRED_EX+Back.BLUE+Style.DIM
 col_headBBlk = Fore.BLACK+Back.MAGENTA+Style.BRIGHT
 col_headBlk  = Fore.BLACK+Back.MAGENTA+Style.NORMAL
 col_date     = Fore.LIGHTGREEN_EX+Back.LIGHTBLACK_EX
 col_error    = Fore.RED+Back.YELLOW+Style.NORMAL
 col_errorB   = Fore.RED+Back.YELLOW+Style.BRIGHT
 col_input    = Fore.BLACK+Back.LIGHTBLACK_EX+Style.DIM
 col_excep    = Fore.BLUE+Back.LIGHTBLACK_EX+Style.DIM
 col_resp     = Fore.BLACK+Back.MAGENTA+Style.BRIGHT
 # Dialogos
 diag_bar    = '==========================='
 diag_spc    = '                           '
 diag_state  = [ diag_bar, '  ESTADO TERMO  ', ' ENCENDIDO ', '  APAGADO  ', '  - - - -  ' ]
 diag_modo   = [ '  MODO          ', '  AUTO     ', '  MANUAL   ',
                '  LIBRE    ', '  ¡ERROR!  ' ]
 diag_hrsfun = [ '  ON-1  ', ' OFF-1 ', '  ON-2  ', ' OFF-2 ', diag_bar ]
 diag_opcs   = [ diag_bar, '     Menu de Opciones      ', diag_spc,
                '  1) Modo Autonomo         ', '  2) Ajustar hora y fecha  ',
                '  3) Ajustar temporizador  ', '  4) Calibrar servo        ',
                '  5) Modo Manual           ', '  6) Modo Libre            ',
                '  v) Volver(en sub-menus)  ', '  s) Salir                 ',
                '  ⏎) Actualizar            ', diag_spc, 
                ' Ingresa una opción        \b\b\b\b\b\b:' ]
 diag_setdate = [ diag_bar,'  Valores actuales en RTC  ', '   Hora  :   ', '   Fecha :   ',
                 diag_bar, diag_spc, '  Ajustando fecha y hora   ', diag_spc,
                 '        DIA       :        \b\b\b\b\b\b\b',
                 '        MES       :        \b\b\b\b\b\b\b',
                 '        AÑO       :        \b\b\b\b\b\b\b',
                 '        HORA      :        \b\b\b\b\b\b\b',
                 '        MINUTO    :        \b\b\b\b\b\b\b',
                 '        SEGUNDO   :        \b\b\b\b\b\b\b'  ]
 diag_error   = [ ' Ingresa un número válido! ', '  Debes ingresar \'on\' u \'off\' ',
                 '    Entrada no válida!     ', '    Entrada incorrecta!    ' ]
 diag_settimer = [ diag_bar,'   Horario Temporizador    ', '  ON-1  ', ' OFF-1 ',
                  '  ON-2  ',' OFF-2 ', diag_bar, diag_spc, '   Ingresa nuevo horario   ',
                  diag_spc, '    1er Encendido  :       \b\b\b\b\b\b',
                  '    1er Apagado    :       \b\b\b\b\b\b',
                  '    2do Ecendido (opc.):   \b\b','    2do Apagado  (opc.):   \b\b' ]
 diag_posservo = [ diag_bar,'   Configuracion Actual    ', '  1 Posición ON   ', 
                  '  2 Posición ON   ', '  1 Posición OFF  ','  2 Posición OFF  ',
                  diag_bar, diag_spc,'  Ingresa nuevos valores   ', diag_spc,
                  ' 1ra posic. encendido :    \b\b\b\b',
                  ' 2da posic. encendido :    \b\b\b\b',
                  ' 1ra posic. apagado   :    \b\b\b\b',
                  ' 2da posic. apagado   :    \b\b\b\b' ]
 diag_accman  = [ diag_bar, '   Accionamiento Manual    ', diag_state[1:5],
                 diag_bar, diag_spc, '    Encender o Apagar ?    ', diag_spc,
                 ' Ingresa \'on\' u \'off\':     \b\b\b\b' ]
 diag_servman = [ diag_bar, '     Movimiento Libre      ', diag_bar, diag_spc, 
                 'Posiciónes validas (16-164)', diag_spc ,
                 '   Ingresa posición :      \b\b\b\b\b' ]
 diag_excepcn = [ diag_spc, ' Error en lectura de datos ', '  Arduino no disponible    ',
                 '  Error al solicitar datos ', f'  Intentando conexión (', ')  ',
                 ' Imposible conectar con    ', ' ESP o Arduino, verifica   ',
                 ' IP, conexión o estado de  ', ' de los dispositivos.      ' ]
 diag_volver  = [ diag_spc, '      Actualizando...      ',
                '        Volviendo...       ', '    Seleción incorrecta    ' ]
 # Valores para validación
 #                 (min, max) dia - mes - año - hora - minuto - segundo
 valid_dates     = [(0,32),(0,13),(2020,2100),(-1,24),(-1,60),(-1,60)]
 valid_opcs      = ['1','2','3','4','5','6','']
 valid_hrs_timer = (-1,24)
 valid_posicion  = (15,168)
 valid_manual    = ('on', 'off')
 def resp_conex(excepcion=None, intentos=0):
    """Imprime en terminal dialogos de error de conexión 
    :excepcion: str (tipo de error)
    :intentos: int (nro. de intentos de conexión)
    """
    intentos += 1
    dialogos = diag_excepcn
    match excepcion:
        case 'assert':
            clear()
            print(col_menu + dialogos[0] + col_rst)
            print(col_error + dialogos[1] + col_rst)
            print(col_menu + dialogos[4] + str(intentos) + dialogos[5] + col_rst)
            print(col_menu + dialogos[0] + col_rst)
        case 'conexion':
            clear()
            print(col_menu + dialogos[0] + col_rst)
            print(col_error + dialogos[2] + col_rst)
            print(col_menu + dialogos[4] + str(intentos) + dialogos[5] + col_rst)
            print(col_menu + dialogos[0] + col_rst)
        case 'oserror':
            clear()
            print(col_menu + dialogos[0] + col_rst)
            print(col_error + dialogos[3] + col_rst)
            print(col_menu + dialogos[4] + str(intentos) + dialogos[5] + col_rst)
            print(col_menu + dialogos[0] + col_rst)
        case _:
            clear()
            print(col_menu + dialogos[0] + col_rst)
            for dialogo in dialogos[6:10]:
                print(col_errorB + dialogo + col_rst)
            print(col_menu + dialogos[0] + col_rst)
 def pant_servo_manual():
    """Imprime en terminal dialogos de configuración manual del servo
    """
    clear()
    dialogos = diag_servman[:-1]
    for dialogo in dialogos: 
        print(col_menu+dialogo+col_rst)
 def pant_accion_manual(estado):
    """Imprime en terminal dialogos de accionamiento manual del servo
    :estado: str ('0' o '1')
    """
    clear()
    dialogos = diag_accman[0:7]
    for ind, dialogo in enumerate(dialogos):
        match ind:
            case 2:
                print(col_head+dialogo[0]+col_rst, end='')
                match estado:
                    case '1':
                        print(col_headGrn+dialogo[1]+col_rst)
                    case '0':
                        print(col_headBlk+dialogo[2]+col_rst)
                    case _:
                        print(col_headBlk+dialogo[3]+col_rst)
                ind+=3
            case _:
                print(col_menu+dialogo+col_rst)
 def pant_posic_servo(pos_servo):
    """Imprime en terminal posiciones de trabajo del servo
    :pos_servo: list[str]
    """
    clear()
    dialogos = diag_posservo[0:10]
    for ind, dialogo in enumerate(dialogos):
        match ind:
            case 2:
                print(f"{col_head}{dialogo}{col_headGrn}  {pos_servo[0]}    {col_rst}")
            case 3:
                print(f"{col_head}{dialogo}{col_headGrn}  {pos_servo[1]}    {col_rst}")
            case 4:
                print(f"{col_head}{dialogo}{col_headGrn}  {pos_servo[2]}    {col_rst}")
            case 5:
                print(f"{col_head}{dialogo}{col_headGrn}  {pos_servo[3]}    {col_rst}")
            case _:
                print(col_menu + dialogo + col_rst) 
 def pant_termporizador(hrs_timer):
    """Imprime en terminal horas de trabajo del servo
    :hrs_timer: list[str]
    """
    clear()
    dialogos = diag_settimer[0:10]
    for ind, dialogo in enumerate(dialogos):
        match ind:
            case 2:
                #ind+=1
                print(f"{col_head}{dialogo}{col_headGrn}  {hrs_timer[0]}  {col_rst}", end='')
            case 3:
                print(f"{col_head}{dialogo}{col_headGrn}  {hrs_timer[1]}  {col_rst}")
            case 4:
                print(f"{col_head}{dialogo}{col_headGrn}  {hrs_timer[2]}  {col_rst}", end='')
            case 5:
                print(f"{col_head}{dialogo}{col_headGrn}  {hrs_timer[3]}  {col_rst}")
            case _:
                print(col_menu + dialogo + col_rst) 
 def pant_config_fecha(tiempo):
    """Imprime hora y fecha en terminal, segun ESP.
    :tiempo: list[str] [hora, minuto, segundo, dia, mes, año]
    """
    clear()
    dialogos = diag_setdate
    for ind, dialogo in enumerate(dialogos):
        match ind:
            case 2:
                print(f"{col_date}{dialogo}{tiempo[0]}:{tiempo[1]}:{tiempo[2]}      {col_rst}")
            case 3:
                print(f"{col_date}{dialogo}{tiempo[3]}/{tiempo[4]}/{tiempo[5]}    {col_rst}")
            case 8:
                break
            case _:
                print(col_menu + dialogo + col_rst) 
 def pant_principal(modo, estado, tiempo, hrs_timer):
    """Imprime menu principal en terminal.
    :modo: str (ej. '\\n')
    :estado: str estado del termo ('0','1')
    :tiempo: List[str] hora y fecha
    :hrs_timer: List[str] horario de accionamiento
    """
    clear()
    # Estado
    dialogos = diag_state
    print(col_menu+dialogos[0]+col_rst)
    print(col_head+dialogos[1]+col_rst, end='')
    match estado:
        case '1':
            print(col_headGrn+dialogos[2]+col_rst)
        case '0':
            print(col_headBlk+dialogos[3]+col_rst)
        case _:
            print(col_headBlk+dialogos[4]+col_rst)
    # Modo de operación
    dialogos = diag_modo
    print(col_head+dialogos[0]+col_rst, end='')
    match modo:
        case '\n1':
            print(col_headGrn+dialogos[1]+col_rst)
        case '\n5':
            print(col_headBlk+dialogos[2]+col_rst)
        case '\n6':
            print(col_headBlk+dialogos[3]+col_rst)
        case _:
            print(col_headRed+dialogos[4]+col_rst)
    # Hora y Fecha
    print(col_date, end='')
    print(f"   {tiempo[0]}:{tiempo[1]}:{tiempo[2]}", end='')
    print(f"   {tiempo[3]}/{tiempo[4]}/{tiempo[5]}   "+col_rst)
    # Horas de funcionamiento
    dialogos = diag_hrsfun
    print(col_head + dialogos[0] + col_rst, end='')
    print(col_headBBlk + '  ' + hrs_timer[0] + '  ' + col_rst, end='')
    print(col_head + dialogos[1]+col_rst, end='')
    print(col_headBBlk + '  ' + hrs_timer[1] + '  ' + col_rst)
    print(col_head + dialogos[2] + col_rst, end='')
    print(col_headBBlk + '  ' + hrs_timer[2] + '  ' + col_rst, end='')
    print(col_head + dialogos[3]+col_rst, end='')
    print(col_headBBlk + '  ' + hrs_timer[3] + '  ' + col_rst)
    # Opciones del menu principal
    dialogos = diag_opcs[:-1]
    for indx, dialogo in enumerate(dialogos):
        if indx != (len(dialogos)-1):
            print(col_menu+dialogo+col_rst)
        else:
            print(col_menu+dialogo+col_rst)
 def pant_test_valores(valores):
    """Función de prueba, imprime en terminal valores de lista.
    :valores: Lista de strings [ str, str, ...]
    """
    for val in valores:
        print(Fore.MAGENTA+Back.BLACK+Style.BRIGHT+val+Style.RESET_ALL)
 def valida_entrada(valid, mensaje, tipo_dato='') -> list[str] | str:
    """Solicita entrada de usuario, imprime dialogo en terminal y 
    valida según tupla *valid*.
    :valid: tuple (límites o alternativas válidas)
    :mensaje: str (mensaje para solicitar entrada de usuario)
    """
    invalido = True
    err_msg = ''
    while invalido:
        entrada_usuario = input(col_input+mensaje+Style.RESET_ALL)
        if entrada_usuario == 's':
            sys.exit()
            #return 's'
        elif entrada_usuario == 'v':
            main()
            #return 'v'
        match tipo_dato:
            case '':
                try:
                    entrada_usuario = int(entrada_usuario)
                    if valid[0] < entrada_usuario < valid[1]:
                        invalido = False
                        return str(entrada_usuario)
                    else:
                        raise ValueError
                except ValueError:
                    err_msg = diag_error[0]
                    print(col_error + err_msg + Style.RESET_ALL)
            case 'str':
                try:
                    if entrada_usuario in valid:
                        invalido = False
                        return entrada_usuario
                    else:
                        err_msg = diag_error[3]
                        raise ValueError
                except ValueError:
                    err_msg = diag_error[3]
                    print(col_error + err_msg + Style.RESET_ALL)
            case _:
                assert entrada_usuario in ['','str']
                err_msg = diag_error[2]
                print(col_error + err_msg + Style.RESET_ALL)
 def entrada_usuario(caso=None) -> list[str] | str :
    """Retorna la(s) respuesta(s) del usuario, segun caso (submenu)
    :caso: str (submenu)
    """
    match caso:
        case '/sethora':
            user_ins = []
            i = 0
            for preg in diag_setdate[8:14]:
                user_ins.append(valida_entrada(valid_dates[i], preg))
                i += 1
            return user_ins
        case '/horasAcc':
            user_ins = []
            for preg in diag_settimer[10:14]:
                user_ins.append(valida_entrada(valid_hrs_timer, preg))
            return user_ins
        case '/setservo':
            user_ins = []
            for preg in diag_posservo[10:14]:
                user_ins += valida_entrada(valid_posicion, preg)
            return user_ins
        case '/accion':
            return valida_entrada(valid_manual ,diag_accman[-1],'str')
        case '/setlibre':
            return valida_entrada(valid_posicion ,diag_servman[-1])
        case _:
            mensaje = ' Ingresa una opción        \b\b\b\b\b\b:'
            return valida_entrada(valid_opcs, mensaje, 'str')
 def respuesta_config(respuesta):
    """Imprime el argumento formateado en el terminal bajo el contexto de 
    respuesta del ESP a alguna configuración.
    :respuesta: str (mensaje de respuesta)
    """
    print(col_resp + respuesta + col_rst)
 def respuesta_info(caso='foo'):
    """Imprime en terminal bajo el contexto de respuesta informativa o 
    advertencia del ESP a alguna solicitud.
    :caso: str (tipo de mensaje)
    """
    match caso:
        case 'error':
            print(col_error + diag_volver[3] + col_rst)
            sleep(1)
        case 'volver':
            print(col_error + diag_volver[2] + col_rst)
            sleep(1)
        case _:
            print(col_error + diag_volver[1] + col_rst)
            sleep(1)
Author	SHA1	Message	Date
jp.av.dev	6a140d1538	refact bool espera -> sentido (giro servo) mejora en función de accionamiento del servo	2022-10-26 04:16:55 -03:00
jp.av.dev	e56c9f0267	ed: README	2022-10-26 03:28:26 -03:00
jp.av.dev	774c95f060	fix: bash script -> curl caldera.sh -> Argumentos para curl sin ""	2022-09-24 20:12:42 -03:00
jp.av.dev	1772fc3391	ed: README eliminado link superior a video inferior (md incompatibles gitea-gitlab)	2022-05-27 22:11:40 -04:00
jp.av.dev	d428279ebc	ed: README + demo video	2022-05-27 22:09:39 -04:00
jp.av.dev	35fb6c09db	+: licencia	2022-04-27 01:56:18 -04:00
jp.av.dev	1a754be89d	ed: script python -> tiempos de espera ajustados Tiempos de espera error de conexión, aserción. Tiempos tras solicitar modo autonomo o modo manual, espera el término del accionamiento mecánico.	2022-04-23 17:03:12 -04:00
jp.av.dev	568e4288e9	link telegram-bot	2022-04-22 05:11:49 -04:00
jp.av.dev	e83f0ea8f6	ed: dialogos esp, readme diagrama de secuencia general mejora dialogos vista_term mejora dialogs esp	2022-04-22 04:57:15 -04:00
jp.av.dev	e4a8729e0e	edit readmes	2022-04-21 18:54:22 -04:00
jp.av.dev	f63cf43406	mensajes de respuesta ESP acortados	2022-04-21 13:56:05 -04:00
jp.av.dev	1975f6165d	fix shebang para python 3.10, edit readmes	2022-04-21 13:44:00 -04:00
jp.av.dev	52cd694a41	edit readme y arreglos menores	2022-04-20 22:23:18 -04:00
jp.av.dev	da563be55d	Reestructuración - separación de la vista	2022-04-20 15:56:56 -04:00
jp.av.dev	f6a008bf46	ed:scripts/caldera.sh linea 37 [ if nonzero_length ]	2021-08-04 16:07:52 -04:00
jp.av.dev	43241d681f	reinicio de bool intentos en opc 1	2021-07-19 22:04:48 -04:00
jp.av.dev	27d5dfaaa2	ed: READMEs	2021-07-18 15:44:09 -04:00
jp.av.dev	7d6405bf4f	+img python script en README	2021-07-18 04:42:07 -04:00
jp.av.dev	851ce7cbea	+Python script	2021-07-18 04:39:56 -04:00
jp.av.dev	c4324416a8	bash script: pantallas individuales por config	2021-07-16 05:16:30 -04:00
jp.av.dev	4eb3c5bca2	hardcode por array en caldera.sh	2021-07-15 14:55:32 -04:00
jp.av.dev	31acdca43e	add README.md	2021-07-14 22:02:19 -04:00
jp.av.dev	aacf5f186c	Update caldera_esp/README.md	2021-07-14 22:01:35 -04:00
jp.av.dev	1a5682cf4e	Update caldera_rata/README.md	2021-07-14 21:59:36 -04:00
jp.av.dev	1cf155a6c4	update README.md	2021-07-14 21:56:30 -04:00
jp.av.dev	0a47198535	merge master/devel	2021-07-14 20:59:45 -04:00
jp.av.dev	a5c24bf14a	script bash	2021-07-14 20:53:15 -04:00
jp.av.dev	3802521e03	codigo módulo ESP01 y readme	2021-07-14 20:48:37 -04:00
jp.av.dev	ae5b1065fa	patch caldera_rat.ino form devel branch	2021-07-14 19:35:38 -04:00
jp.av.dev	81f7e7f83b	edit readme	2021-07-14 02:20:47 -04:00
jp.av.dev	17aa9f97ef	README.md	2021-07-14 02:17:10 -04:00
jp.av.dev	f0df1efe49	release	2021-07-12 00:03:14 -04:00
jp.av.dev	a2afc5c7ea	funcinamiento autonomo y/o Serial	2021-07-11 20:44:55 -04:00