From cafad9a928a1339207a9aba41bd8c6df4dccf765 Mon Sep 17 00:00:00 2001 From: jdflyer Date: Tue, 9 Jul 2024 23:11:29 -0700 Subject: [PATCH 1/7] Refactor for 2.0 --- QLiteOSD/LICENSE | 674 ------------ QLiteOSD/OSD_positions_config.h | 77 -- QLiteOSD/QLiteOSD.ino | 980 ++---------------- QLiteOSD/config.h | 40 - QLiteOSD/src/MSP_OSD.cpp | 155 +++ QLiteOSD/{ => src}/MSP_OSD.h | 33 +- QLiteOSD/src/config.cpp | 79 ++ QLiteOSD/src/config.h | 169 +++ QLiteOSD/src/config_values.cpp | 123 +++ QLiteOSD/src/craft.cpp | 191 ++++ QLiteOSD/src/craft.h | 77 ++ QLiteOSD/src/filesystem.cpp | 23 + QLiteOSD/src/filesystem.h | 14 + QLiteOSD/src/gpsLog.cpp | 117 +++ QLiteOSD/src/gpsLog.h | 31 + .../MSP => QLiteOSD/src/libraries}/MSP.cpp | 0 .../MSP => QLiteOSD/src/libraries}/MSP.h | 0 QLiteOSD/src/web_interface.cpp | 292 ++++++ QLiteOSD/src/web_interface.h | 55 + .../web_interface_html.cpp} | 51 +- libraries/MSP/readme.md | 1 - 21 files changed, 1456 insertions(+), 1726 deletions(-) delete mode 100644 QLiteOSD/LICENSE delete mode 100644 QLiteOSD/OSD_positions_config.h delete mode 100644 QLiteOSD/config.h create mode 100644 QLiteOSD/src/MSP_OSD.cpp rename QLiteOSD/{ => src}/MSP_OSD.h (90%) create mode 100644 QLiteOSD/src/config.cpp create mode 100644 QLiteOSD/src/config.h create mode 100644 QLiteOSD/src/config_values.cpp create mode 100644 QLiteOSD/src/craft.cpp create mode 100644 QLiteOSD/src/craft.h create mode 100644 QLiteOSD/src/filesystem.cpp create mode 100644 QLiteOSD/src/filesystem.h create mode 100644 QLiteOSD/src/gpsLog.cpp create mode 100644 QLiteOSD/src/gpsLog.h rename {libraries/MSP => QLiteOSD/src/libraries}/MSP.cpp (100%) rename {libraries/MSP => QLiteOSD/src/libraries}/MSP.h (100%) create mode 100644 QLiteOSD/src/web_interface.cpp create mode 100644 QLiteOSD/src/web_interface.h rename QLiteOSD/{web_interface.h => src/web_interface_html.cpp} (83%) delete mode 100644 libraries/MSP/readme.md diff --git a/QLiteOSD/LICENSE b/QLiteOSD/LICENSE deleted file mode 100644 index f288702..0000000 --- a/QLiteOSD/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/QLiteOSD/OSD_positions_config.h b/QLiteOSD/OSD_positions_config.h deleted file mode 100644 index 7d2c012..0000000 --- a/QLiteOSD/OSD_positions_config.h +++ /dev/null @@ -1,77 +0,0 @@ -//OSD elements positions -//in betaflight configurator set OSD elements to your desired positions and in CLI type "set osd" to retreieve the numbers. -//234 -> not visible. Horizontally 2048-2074(spacing 1), vertically 2048-2528(spacing 32). 26 characters X 15 lines - -#include - -//currently working elements -const uint16_t osd_altitude_pos = 2240; -const uint16_t osd_numerical_vario_pos = 2273; -const uint16_t osd_avg_cell_voltage_pos = 2145; -const uint16_t osd_main_batt_voltage_pos = 2113; -const uint16_t osd_crosshairs_pos = 2254; -const uint16_t osd_craft_name_pos = 2048; - -#ifdef USE_GPS -uint16_t osd_gps_sats_pos = 2074; -const uint16_t osd_home_dir_pos = 2095; -const uint16_t osd_home_dist_pos = 2337; -const uint16_t osd_gps_speed_pos = 2305; -const uint16_t osd_gps_lat_pos = 2432; -const uint16_t osd_gps_lon_pos = 2464; -#else -uint16_t osd_gps_sats_pos = 234; -const uint16_t osd_home_dir_pos = 234; -const uint16_t osd_home_dist_pos = 234; -const uint16_t osd_gps_speed_pos = 234; -const uint16_t osd_gps_lat_pos = 234; -const uint16_t osd_gps_lon_pos = 234; -#endif - -const uint16_t osd_pitch_angle_pos = 234; -const uint16_t osd_roll_angle_pos = 234; -const uint16_t osd_rssi_value_pos = 234; -const uint16_t osd_display_name_pos = 234; -const uint16_t osd_flymode_pos = 234; -const uint16_t osd_current_draw_pos = 234; -const uint16_t osd_mah_drawn_pos = 234; - -//not implemented or not available -const uint16_t osd_throttle_pos_pos = 234; -const uint16_t osd_vtx_channel_pos = 234; -const uint16_t osd_roll_pids_pos = 234; -const uint16_t osd_pitch_pids_pos = 234; -const uint16_t osd_yaw_pids_pos = 234; -const uint16_t osd_power_pos = 234; -const uint16_t osd_pidrate_profile_pos = 234; -const uint16_t osd_warnings_pos = 234; -const uint16_t osd_debug_pos = 234; -const uint16_t osd_artificial_horizon_pos = 234; -const uint16_t osd_horizon_sidebars_pos = 234; -const uint16_t osd_item_timer_1_pos = 234; -const uint16_t osd_item_timer_2_pos = 234; -const uint16_t osd_main_batt_usage_pos = 234; -const uint16_t osd_disarmed_pos = 234; -const uint16_t osd_numerical_heading_pos = 234; -const uint16_t osd_compass_bar_pos = 234; -const uint16_t osd_esc_tmp_pos = 234; -const uint16_t osd_esc_rpm_pos = 234; -const uint16_t osd_remaining_time_estimate_pos = 234; -const uint16_t osd_rtc_datetime_pos = 234; -const uint16_t osd_adjustment_range_pos = 234; -const uint16_t osd_core_temperature_pos = 234; -const uint16_t osd_anti_gravity_pos = 234; -const uint16_t osd_g_force_pos = 234; -const uint16_t osd_motor_diag_pos = 234; -const uint16_t osd_log_status_pos = 234; -const uint16_t osd_flip_arrow_pos = 234; -const uint16_t osd_link_quality_pos = 234; -const uint16_t osd_flight_dist_pos = 234; -const uint16_t osd_stick_overlay_left_pos = 234; -const uint16_t osd_stick_overlay_right_pos = 234; -const uint16_t osd_esc_rpm_freq_pos = 234; -const uint16_t osd_rate_profile_name_pos = 234; -const uint16_t osd_pid_profile_name_pos = 234; -const uint16_t osd_profile_name_pos = 234; -const uint16_t osd_rssi_dbm_value_pos = 234; -const uint16_t osd_rc_channels_pos = 234; diff --git a/QLiteOSD/QLiteOSD.ino b/QLiteOSD/QLiteOSD.ino index 78d02cd..33ba7ac 100644 --- a/QLiteOSD/QLiteOSD.ino +++ b/QLiteOSD/QLiteOSD.ino @@ -34,956 +34,130 @@ /* ----------------------------------------------------- */ -#include "config.h" -#include -#include "MSP_OSD.h" -#include "OSD_positions_config.h" -#include // May need to adjust for I2C address #define BMP280_ADDRESS (0x76) +#include "src/libraries/MSP.h" -#define VERSION "1.6" -#define BMP_ADDRESS 0x76 // default is 0x77 -#define SPEED_IN_KILOMETERS_PER_HOUR //if commented out defaults to m/s -#define FC_FIRMWARE_NAME "Betaflight" -#define FC_FIRMWARE_IDENTIFIER "BTFL" -#define CONFIG "/conf.txt" - -#ifdef USE_GPS -#include -#include - -#ifdef ESP8266 -static const int gps_RX_pin = D8, gps_TX_pin = D7; // these were swapped in 1.2 to match board -#else -static const int gps_RX_pin = 4, gps_TX_pin = 3; -#endif -static const uint32_t GPSBaud = 9600; - -#ifdef LOG_GPS -#include -#include -#include -#include -#include -#include "web_interface.h" -static const uint8_t fileServerModePin = D3; //Pin used to check what mode the program should start in, if high the filesystem server will be started -static bool fileServerOn = false; -static uint32_t gpsLogInterval = 500; -String ap_ssid = "QLiteOSD"; -static const char *ap_psk = "12345678"; -static File gpsLogFile; -static bool fsInit = false; -static bool fileStarted = false; -static int onPinCount = 0; -static bool gpsLoggingStarted = false; - -struct GPS_LOG_FRAME { - float latitude; - float longitude; - float altitude; //gpx uses meters for altitude - float heading; - float speed; -}; - -GPS_LOG_FRAME lastFrame; - -ESP8266WebServer webserver(80); -#endif - -TinyGPSPlus gps; -SoftwareSerial gpsSerial(gps_RX_pin, gps_TX_pin); -#endif - -#ifdef ESP8266 -static const int pwm_arm_pin = D5; -#else -static const int pwm_arm_pin = 10; // pro mini arduino -#endif -static int triggerValue = 1700; - - -HardwareSerial &mspSerial = Serial; -MSP msp; -Adafruit_BMP280 bme; // I2C - -//Altitude BMP -const float PRESSURE = 1013.25; // local air pressure -float HomeAlt = 0.0; -int sampleCount = 0; -int lastCount = 0; -float altSamples = 0.0; -static const uint8_t armAltitude = 150; // Centimeters high at witch arm signal is sent to DJI goggles -int16_t lastAltRead = 0; //cm -boolean lightOn = true; - -//Voltage and Battery Reading -#ifdef ESP8266 -const float arduinoVCC = 3.25; //Measured ESP8266 3.3 pin voltage -#else -const float arduinoVCC = 4.95; //Measured Arduino 5V pin voltage -#endif -float ValueR1 = 7500.0; //7.5K Resistor -float ValueR2 = 30000.0; //30K Resistor -const int alanogPin = A0; -float averageVoltage = 0.0; -int sampleVoltageCount = 0; -boolean activityDetected = false; - -//Other -const char fcVariant[5] = "BTFL"; -uint32_t previousMillis_MSP = 0; -const uint32_t next_interval_MSP = 100; -uint32_t custom_mode = 0; //flight mode -uint8_t vbat = 0; -float airspeed = 0; -int16_t groundspeed = 0; -int32_t relative_alt = 0; // in milimeters -uint32_t altitude_msp = 0; // EstimatedAltitudeCm -uint16_t rssi = 0; -uint8_t battery_remaining = 0; -uint32_t flightModeFlags = 0x00000002; -int16_t amperage = 0; -uint16_t mAhDrawn = 0; -float f_mAhDrawn = 0.0; -uint8_t numSat = 0; -uint8_t pid_roll[3]; -uint8_t pid_pitch[3]; -uint8_t pid_yaw[3]; -int32_t gps_lon = 0; -int32_t gps_lat = 0; -int32_t gps_alt = 0; -double gps_home_lon = 0; -double gps_home_lat = 0; -int32_t gps_home_alt = 0; -int16_t roll_angle = 0; -int16_t pitch_angle = 0; -uint32_t distanceToHome = 0; // distance to home in meters -int16_t directionToHome = 0; // direction to home in degrees -uint16_t batteryCapacity = 2200; -uint8_t legacyBatteryVoltage = 0; -uint8_t batteryState = 0; // voltage color 0==white, 1==red -uint16_t batteryVoltage = 0; -int16_t heading = 0; -uint8_t set_home = 1; -uint32_t general_counter = next_interval_MSP; -uint16_t blink_sats_orig_pos = osd_gps_sats_pos; -uint16_t blink_sats_blank_pos = 234; -uint32_t previousFlightMode = custom_mode; -int16_t climb_rate = 0; - -msp_battery_state_t battery_state = { 0 }; -msp_name_t name = { 0 }; -msp_fc_version_t fc_version = { 0 }; -msp_fc_variant_t fc_variant = { 0 }; -//msp_status_BF_t status_BF = {0}; -msp_status_DJI_t status_DJI = { 0 }; -msp_analog_t analog = { 0 }; -msp_raw_gps_t raw_gps = { 0 }; -msp_comp_gps_t comp_gps = { 0 }; -msp_attitude_t attitude = { 0 }; -msp_altitude_t altitude = { 0 }; +#include "src/config.h" +#include "src/MSP_OSD.h" +#include "src/craft.h" +#include "src/filesystem.h" +#include "src/web_interface.h" +#include "src/gpsLog.h" /* ----------------------------------------------------- */ void setup() { Serial.begin(115200); - msp.begin(mspSerial); - bme.begin(BMP_ADDRESS); //Default Address 0x77 - pinMode(LED_BUILTIN, OUTPUT); - logOnDebug("Starting!"); -#ifdef ESP8266 - if (SPIFFS.begin()) { - fsInit = true; - readConfig(); - }else { - logOnDebug("FS Init Fail!!"); - } -#endif + +#ifdef WEB_INTERFACE + filesystemInit(); + configInit(); + #ifdef LOG_GPS - logRemoveOldFiles(10); - pinMode(fileServerModePin, INPUT); + gpsLogDeleteOldFiles(); #endif -#ifdef USE_GPS - gpsSerial.begin(GPSBaud); + pinMode(WEB_INTERFACE_BUTTON_PIN, INPUT); #endif -if (USE_PWM_ARM) { - pinMode(pwm_arm_pin, INPUT_PULLUP); -} - - - delay(1000); - - status_DJI.cycleTime = 0x0080; - status_DJI.i2cErrorCounter = 0; - status_DJI.sensor = 0x23; - status_DJI.configProfileIndex = 0; - status_DJI.averageSystemLoadPercent = 7; - status_DJI.accCalibrationAxisFlags = 0; - status_DJI.DJI_ARMING_DISABLE_FLAGS_COUNT = 20; - status_DJI.djiPackArmingDisabledFlags = (1 << 24); - flightModeFlags = 0x00000002; - - // Calibrate and Initialize Home Altitude - altSamples = bme.readAltitude(PRESSURE); -} - -msp_osd_config_t msp_osd_config = { 0 }; - -void send_osd_config() { - - if (IMPERIAL_UNITS) { - msp_osd_config.units = 0; - } else { - msp_osd_config.units = 1; - } + craftState.init(); + mspOsd.init(); - msp_osd_config.osd_item_count = 56; - msp_osd_config.osd_stat_count = 24; - msp_osd_config.osd_timer_count = 2; - msp_osd_config.osd_warning_count = 16; // 16 - msp_osd_config.osd_profile_count = 1; // 1 - msp_osd_config.osdprofileindex = 1; // 1 - msp_osd_config.overlay_radio_mode = 0; // 0 - - msp_osd_config.osd_rssi_value_pos = osd_rssi_value_pos; - msp_osd_config.osd_main_batt_voltage_pos = osd_main_batt_voltage_pos; - msp_osd_config.osd_crosshairs_pos = osd_crosshairs_pos; - msp_osd_config.osd_artificial_horizon_pos = osd_artificial_horizon_pos; - msp_osd_config.osd_horizon_sidebars_pos = osd_horizon_sidebars_pos; - msp_osd_config.osd_item_timer_1_pos = osd_item_timer_1_pos; - msp_osd_config.osd_item_timer_2_pos = osd_item_timer_2_pos; - msp_osd_config.osd_flymode_pos = osd_flymode_pos; - msp_osd_config.osd_craft_name_pos = osd_craft_name_pos; - msp_osd_config.osd_throttle_pos_pos = osd_throttle_pos_pos; - msp_osd_config.osd_vtx_channel_pos = osd_vtx_channel_pos; - msp_osd_config.osd_current_draw_pos = osd_current_draw_pos; - msp_osd_config.osd_mah_drawn_pos = osd_mah_drawn_pos; - msp_osd_config.osd_gps_speed_pos = osd_gps_speed_pos; - msp_osd_config.osd_gps_sats_pos = osd_gps_sats_pos; - msp_osd_config.osd_altitude_pos = osd_altitude_pos; - msp_osd_config.osd_roll_pids_pos = osd_roll_pids_pos; - msp_osd_config.osd_pitch_pids_pos = osd_pitch_pids_pos; - msp_osd_config.osd_yaw_pids_pos = osd_yaw_pids_pos; - msp_osd_config.osd_power_pos = osd_power_pos; - msp_osd_config.osd_pidrate_profile_pos = osd_pidrate_profile_pos; - msp_osd_config.osd_warnings_pos = osd_warnings_pos; - msp_osd_config.osd_avg_cell_voltage_pos = osd_avg_cell_voltage_pos; - msp_osd_config.osd_gps_lon_pos = osd_gps_lon_pos; - msp_osd_config.osd_gps_lat_pos = osd_gps_lat_pos; - msp_osd_config.osd_debug_pos = osd_debug_pos; - msp_osd_config.osd_pitch_angle_pos = osd_pitch_angle_pos; - msp_osd_config.osd_roll_angle_pos = osd_roll_angle_pos; - msp_osd_config.osd_main_batt_usage_pos = osd_main_batt_usage_pos; - msp_osd_config.osd_disarmed_pos = osd_disarmed_pos; - msp_osd_config.osd_home_dir_pos = osd_home_dir_pos; - msp_osd_config.osd_home_dist_pos = osd_home_dist_pos; - msp_osd_config.osd_numerical_heading_pos = osd_numerical_heading_pos; - msp_osd_config.osd_numerical_vario_pos = osd_numerical_vario_pos; - msp_osd_config.osd_compass_bar_pos = osd_compass_bar_pos; - msp_osd_config.osd_esc_tmp_pos = osd_esc_tmp_pos; - msp_osd_config.osd_esc_rpm_pos = osd_esc_rpm_pos; - msp_osd_config.osd_remaining_time_estimate_pos = osd_remaining_time_estimate_pos; - msp_osd_config.osd_rtc_datetime_pos = osd_rtc_datetime_pos; - msp_osd_config.osd_adjustment_range_pos = osd_adjustment_range_pos; - msp_osd_config.osd_core_temperature_pos = osd_core_temperature_pos; - msp_osd_config.osd_anti_gravity_pos = osd_anti_gravity_pos; - msp_osd_config.osd_g_force_pos = osd_g_force_pos; - msp_osd_config.osd_motor_diag_pos = osd_motor_diag_pos; - msp_osd_config.osd_log_status_pos = osd_log_status_pos; - msp_osd_config.osd_flip_arrow_pos = osd_flip_arrow_pos; - msp_osd_config.osd_link_quality_pos = osd_link_quality_pos; - msp_osd_config.osd_flight_dist_pos = osd_flight_dist_pos; - msp_osd_config.osd_stick_overlay_left_pos = osd_stick_overlay_left_pos; - msp_osd_config.osd_stick_overlay_right_pos = osd_stick_overlay_right_pos; - msp_osd_config.osd_display_name_pos = osd_display_name_pos; - msp_osd_config.osd_esc_rpm_freq_pos = osd_esc_rpm_freq_pos; - msp_osd_config.osd_rate_profile_name_pos = osd_rate_profile_name_pos; - msp_osd_config.osd_pid_profile_name_pos = osd_pid_profile_name_pos; - msp_osd_config.osd_profile_name_pos = osd_profile_name_pos; - msp_osd_config.osd_rssi_dbm_value_pos = osd_rssi_dbm_value_pos; - msp_osd_config.osd_rc_channels_pos = osd_rc_channels_pos; - - msp.send(MSP_OSD_CONFIG, &msp_osd_config, sizeof(msp_osd_config)); -} - -void invert_pos(uint16_t *pos1, uint16_t *pos2) { - uint16_t tmp_pos = *pos1; - *pos1 = *pos2; - *pos2 = tmp_pos; -} - -void set_flight_mode_flags() { - if (USE_PWM_ARM) { - //USE PWM signal to ARM - volatile int pwmValue = readChannel(pwm_arm_pin, 1000, 2000, 0); - if ((flightModeFlags == 0x00000002) && pwmValue >= triggerValue) { - flightModeFlags = 0x00000003; // armed to start recording - } else if ((flightModeFlags == 0x00000003) && pwmValue < triggerValue && general_counter % 3000 == 0) { - flightModeFlags = 0x00000002; // disarm after 3 second delay - } - } else { - //USE Altitude to Arm - // flightModeFlags = 0x00000003; //Uncomment this to automatically arm on start - if ((flightModeFlags == 0x00000002) && relative_alt > armAltitude) { // if altitude is 1 meter or more then arm to record - flightModeFlags = 0x00000003; // armed to start recording - } - } -} - -// Read the number of a specified channel and convert to the range provided. -// If the channel is off, return the default value -int readChannel(int channelInput, int minLimit, int maxLimit, int defaultValue) { - int ch = pulseIn(channelInput, HIGH, 30000); - if (ch < 100) return defaultValue; - return map(ch, 1000, 2000, minLimit, maxLimit); -} - -void send_msp_to_airunit(uint8_t voltage) { - - uint8_t cellCount = getCellCount(voltage); - //MSP_FC_VARIANT - memcpy(fc_variant.flightControlIdentifier, fcVariant, sizeof(fcVariant)); - msp.send(MSP_FC_VARIANT, &fc_variant, sizeof(fc_variant)); - - //MSP_FC_VERSION - fc_version.versionMajor = 4; - fc_version.versionMinor = 1; - fc_version.versionPatchLevel = 1; - msp.send(MSP_FC_VERSION, &fc_version, sizeof(fc_version)); - - //MSP_NAME - memcpy(name.craft_name, craftname, sizeof(craftname)); - msp.send(MSP_NAME, &name, sizeof(name)); - - //MSP_STATUS - status_DJI.flightModeFlags = flightModeFlags; - status_DJI.armingFlags = 0x0303; - msp.send(MSP_STATUS_EX, &status_DJI, sizeof(status_DJI)); - status_DJI.armingFlags = 0x0000; - msp.send(MSP_STATUS, &status_DJI, sizeof(status_DJI)); - - //MSP_ANALOG - analog.vbat = voltage; - analog.rssi = rssi; - analog.amperage = amperage; - analog.mAhDrawn = mAhDrawn; - msp.send(MSP_ANALOG, &analog, sizeof(analog)); - - //MSP_BATTERY_STATE - battery_state.amperage = amperage; - battery_state.batteryVoltage = (uint16_t)(voltage * 10); - battery_state.mAhDrawn = mAhDrawn; - battery_state.batteryCellCount = cellCount; - battery_state.batteryCapacity = batteryCapacity; - battery_state.batteryState = batteryState; - battery_state.legacyBatteryVoltage = voltage; - msp.send(MSP_BATTERY_STATE, &battery_state, sizeof(battery_state)); - - //MSP_RAW_GPS - raw_gps.lat = gps_lat; - raw_gps.lon = gps_lon; - raw_gps.numSat = numSat; - raw_gps.alt = gps_alt; - raw_gps.groundSpeed = groundspeed; //in cm/s - msp.send(MSP_RAW_GPS, &raw_gps, sizeof(raw_gps)); - - //MSP_COMP_GPS - comp_gps.distanceToHome = (int16_t)distanceToHome; - comp_gps.directionToHome = directionToHome - heading; - msp.send(MSP_COMP_GPS, &comp_gps, sizeof(comp_gps)); - - //MSP_ATTITUDE - attitude.pitch = pitch_angle * 10; - attitude.roll = roll_angle * 10; - msp.send(MSP_ATTITUDE, &attitude, sizeof(attitude)); - - //MSP_ALTITUDE - altitude.estimatedActualPosition = relative_alt; - altitude.estimatedActualVelocity = (int16_t)(climb_rate); //m/s to cm/s - msp.send(MSP_ALTITUDE, &altitude, sizeof(altitude)); - - //MSP_OSD_CONFIG - send_osd_config(); -} - - -void blink_sats() { - if (general_counter % 900 == 0 && set_home == 1 && blink_sats_orig_pos > 2000) { - invert_pos(&osd_gps_sats_pos, &blink_sats_blank_pos); - } else if (set_home == 0) { - osd_gps_sats_pos = blink_sats_orig_pos; - } + pinMode(LED_BUILTIN, OUTPUT); + + debugLog("Starting!"); } -uint8_t getCellCount(uint8_t voltage) { - uint8_t batteryCellCount = 0; - if (voltage < 43 && voltage > 0) batteryCellCount = 1; - else if (voltage < 85) batteryCellCount = 2; - else if (voltage < 127) batteryCellCount = 3; - else if (voltage < 169) batteryCellCount = 4; - else if (voltage < 211) batteryCellCount = 5; - else if (voltage < 255) batteryCellCount = 6; +// Ran once every TICK_INTERVAL msecs +void tick() { + static uint32_t flight_ticks = 0; + static bool lightOn = false; - return batteryCellCount; -} + flight_ticks++; -void readAltitude() { - if (HomeAlt == 0.0) { - calibrateHome(); - } - altSamples += bme.readAltitude(PRESSURE); - sampleCount++; -} +#ifdef WEB_INTERFACE + // 30 tick wait for enabling the web interface + static uint32_t webInterfaceEnableTicks = 0; -void getAltitudeSample() { - lastAltRead = (int16_t)relative_alt; - relative_alt = (int)round(((altSamples / sampleCount) - HomeAlt) * 100); - lastCount = sampleCount; - sampleCount = 0; - altSamples = 0.0; - climb_rate = (lastAltRead - relative_alt) * 5; // assuming 200ms samples needs to be cm/s -} - -void calibrateHome() { - HomeAlt = 0.0; - sampleCount = 1; - while (HomeAlt == 0.0) { - // Build the first sample of readings for Calibration - altSamples += bme.readAltitude(PRESSURE); - sampleCount++; - if (sampleCount == 20) { - HomeAlt = altSamples / (sampleCount); - sampleCount = 0; - altSamples = 0.0; + if (digitalRead(WEB_INTERFACE_BUTTON_PIN) == LOW) { + webInterfaceEnableTicks++; + if (webInterfaceEnableTicks >= WEB_INTERFACE_ENABLE_TICKS) { + webInterfaceInit(); + return; } - delay(100); + }else { + webInterfaceEnableTicks = 0; } -} - -void readVoltage() { - int readValue = analogRead(alanogPin); - averageVoltage += (readValue * (arduinoVCC / 1024.0)) * (1 + (ValueR2 / ValueR1)); - sampleVoltageCount++; -} +#endif -void getVoltageSample() { - vbat = (uint8_t)((averageVoltage / sampleVoltageCount) * 10); - sampleVoltageCount = 0; - averageVoltage = 0.0; -} + craftState.readVoltage(); -#ifdef USE_GPS -void readGPS() { - while (gpsSerial.available()) { - gps.encode(gpsSerial.read()); + if (flight_ticks % ALTITUDE_UPDATE_INTERVAL == 0) { + craftState.readAltitude(); } - if (gps.location.isValid()) { - gps_lat = (int32_t)(gps.location.lat() * 10000000); - gps_lon = (int32_t)(gps.location.lng() * 10000000); - if (gps.satellites.isValid()) { - numSat = gps.satellites.value(); - } - gps_alt = gps.altitude.meters(); - groundspeed = (int16_t)(gps.speed.kmph() * 100000 / 3600); //in cm/s - heading = gps.course.deg(); - if (set_home == 1 && gps.hdop.isValid() && gps.hdop.hdop() < 2) { - gps_home_lat = gps.location.lat(); - gps_home_lon = gps.location.lng(); - set_home = 0; - } - distanceToHome = (unsigned long)(TinyGPSPlus::distanceBetween(gps.location.lat(), gps.location.lng(), gps_home_lat, gps_home_lon)); - directionToHome = TinyGPSPlus::courseTo(gps.location.lat(), gps.location.lng(), gps_home_lat, gps_home_lon); - } -} -#endif - -void loop() { -#ifdef LOG_GPS - if (fileServerOn) { - digitalWrite(LED_BUILTIN, LOW); - webserver.handleClient(); - return; + if (flight_ticks % LIGHT_UPDATE_INTERVAL == 0) { + digitalWrite(LED_BUILTIN, lightOn ? LOW : HIGH); + lightOn = !lightOn; } -#endif - - uint32_t currentMillis_MSP = millis(); - readAltitude(); - readVoltage(); #ifdef USE_GPS - readGPS(); -#endif - - if ((uint32_t)(currentMillis_MSP - previousMillis_MSP) >= next_interval_MSP) { - previousMillis_MSP = currentMillis_MSP; - -#ifdef LOG_GPS - checkTurnOnFileServer(); - logGPS(); -#endif - - if (general_counter % 200 == 0) { // update the altitude values every 200ms - getAltitudeSample(); - if (lightOn) { - digitalWrite(LED_BUILTIN, LOW); - } else { - digitalWrite(LED_BUILTIN, HIGH); - } - lightOn = !lightOn; + craftState.readGPS(); + if (flight_ticks % GPS_SATELITE_BLINK_UPDATE_INTERVAL == 0) { + if (!craftState.gpsHomeSet) { + static bool satsOn = false; + msp_osd_config.osd_gps_sats_pos = satsOn ? GPS_SATS_POS : OSD_HIDDEN; + satsOn = !satsOn; + }else { + msp_osd_config.osd_gps_sats_pos = GPS_SATS_POS; } - getVoltageSample(); - set_flight_mode_flags(); - blink_sats(); - - // SEND the data out -#ifdef DEBUG - debugPrint(); -#else - send_msp_to_airunit(vbat); -#endif - general_counter += next_interval_MSP; } -} - - -#ifdef DEBUG -//*** USED ONLY FOR DEBUG *** -void debugPrint() { - mspSerial.println("**********************************"); - mspSerial.print("Craft Name: "); - mspSerial.println(String(craftname)); - mspSerial.print("Imperial: "); - mspSerial.println(IMPERIAL_UNITS); - mspSerial.print("Flight Mode: "); - mspSerial.println(flightModeFlags); - mspSerial.print("Voltage: "); - mspSerial.println(((double)vbat / 10), 1); - mspSerial.print("Cell Count: "); - mspSerial.println(getCellCount(vbat)); - mspSerial.print("Altitude (cm): "); - mspSerial.println(relative_alt); - mspSerial.print("Climb Rate (cm/s): "); - mspSerial.println(climb_rate); - mspSerial.print("Sample Count / transmit: "); - mspSerial.println(lastCount); - if (USE_PWM_ARM) { - mspSerial.print("PWM Value: "); - mspSerial.println(readChannel(pwm_arm_pin, 1000, 2000, 0)); - } -#ifdef USE_GPS - mspSerial.print("Lat: "); - mspSerial.println(gps_lat); - mspSerial.print("Lon: "); - mspSerial.println(gps_lon); - mspSerial.print("Num Sat: "); - mspSerial.println(numSat); - mspSerial.print("GPS Alt: "); - mspSerial.println(gps_alt); - mspSerial.print("Speed: "); - mspSerial.println(groundspeed); - mspSerial.print("Heading: "); - mspSerial.println(heading); - mspSerial.print("Home Set: "); - mspSerial.println(set_home); - mspSerial.print("HOME Lat: "); - mspSerial.println(gps_home_lat, 6); - mspSerial.print("HOME Lon: "); - mspSerial.println(gps_home_lon, 6); - mspSerial.print("Distance: "); - mspSerial.println(distanceToHome); - mspSerial.print("Direction Home: "); - mspSerial.println(directionToHome); -#endif -} #endif -void logOnDebug(String inValue) { -#ifdef DEBUG - mspSerial.println(inValue); -#endif -} + craftState.setFlightModeFlags(); #ifdef LOG_GPS -//Only used with GPS Option -void logGPSFrame() { - while (gpsSerial.available()) { - gps.encode(gpsSerial.read()); + // Once the flight is armed and home is set, GPS is accurate enough to start logging + if (!gpsLogging && craftState.flightModeFlags == FLIGHT_ARMED && craftState.gpsHomeSet) { + gpsLogInit(); } - if (gpsLoggingStarted == false) { - if (gps.location.isValid()) { - tm currentTime; - currentTime.tm_year = gps.date.year() - 1900; - currentTime.tm_mon = gps.date.month() - 1; - currentTime.tm_mday = gps.date.day(); - currentTime.tm_hour = gps.time.hour(); - currentTime.tm_min = gps.time.minute(); - currentTime.tm_sec = gps.time.second(); - time_t timeStamp = mktime(¤tTime); - gpsLogFile.write((uint8_t *)&timeStamp, sizeof(time_t)); //Timestamp is stored at the neginning of the file - gpsLoggingStarted = true; - } - } - if (!gpsLoggingStarted) { - return; - } - if (!gps.location.isValid()) { - if (lastFrame.latitude != 0.0f) { - gpsLogFile.write((uint8_t *)&lastFrame, sizeof(GPS_LOG_FRAME)); - } - return; - } - GPS_LOG_FRAME logFrame; - logFrame.altitude = (altSamples / sampleCount); //altitude in meters - - logFrame.latitude = gps.location.lat(); - logFrame.longitude = gps.location.lng(); - logFrame.heading = gps.course.deg(); - logFrame.speed = gps.speed.kmph() / 3.6f; - lastFrame = logFrame; - gpsLogFile.write((uint8_t *)&logFrame, sizeof(GPS_LOG_FRAME)); -} - -uint32_t logGetNextFileNum() { - uint32_t maxNum = 1; - Dir dir = SPIFFS.openDir("/"); - File file = dir.openFile("r"); - while (dir.next()) { - if (dir.fileName() != CONFIG) { - maxNum++; - } - } - return maxNum; -} - -void logRemoveOldFiles(uint32_t fileLimit) { - uint32_t nextFile = logGetNextFileNum(); - if (fileLimit >= nextFile) { - return; - } - //If next file is 16, we need to remove 16-10=6 files to get the FS back to 9 files - //The process for this will be removing files 1-6, Then renaming 7 -> 1, 8 -> 2,...,and 15->9, so 10 will be the next file created when the system is armed - int filesToRemove = nextFile - fileLimit; //16 - 10 = 6 - logOnDebug("Files to Remove: " + String(filesToRemove)); - for (int i = 1; i < filesToRemove + 1; i++) { - logOnDebug("Delete: " + String("/") + String(i)); - SPIFFS.remove(String("/") + String(i)); - } - int filesToRename = fileLimit; - for (int i = 1; i < filesToRename; i++) { - String newFile = String("/") + String(i); - String oldFile = String("/") + String(i + filesToRemove); - SPIFFS.rename(oldFile, newFile); + // End the gps log if the flight gets unarmed + if (gpsLogging && craftState.flightModeFlags == FLIGHT_UNARMED) { + gpsLogEnd(); } -} - -void logFileCreate() { - uint32_t nextFileNum = logGetNextFileNum(); -#ifdef DEBUG - Serial.println(String("Attempting to create file with name: ") + String(nextFileNum)); #endif - String fileName = String("/") + String(nextFileNum); - gpsLogFile = SPIFFS.open(fileName, "w"); //need to test what turning off without closing the file does - fileStarted = gpsLogFile; -#ifdef DEBUG - Serial.println("File Created!"); -#endif -} -void logGPS() { - if (flightModeFlags != 3 || fsInit == false) { - return; - } + // SEND the data out #ifdef DEBUG - Serial.println("LOG Gps"); + if (!gpsLogging) + mspOsd.debugPrint(); +#else + mspOsd.sendCraftMSP(); #endif - if (fileStarted == false) { - logFileCreate(); - } - if (general_counter % gpsLogInterval == 0) { - logGPSFrame(); - } -} - -void checkTurnOnFileServer() { - if (digitalRead(fileServerModePin) == LOW && !fileServerOn) { - onPinCount++; - if (onPinCount < 30) { // only turn on if held for 3 seconds - return; - } - gpsSerial.end(); - //Begin fileserver - fileServerOn = true; - ap_ssid += "-" + String(ESP.getChipId(), HEX); - WiFi.softAP(((const char *)ap_ssid.c_str()), ap_psk); - webserver.on("/", showFiles); //Show all logged gps files - webserver.on("/download", downloadFile); //Convert and download a gpx file - webserver.on("/delete", deleteFiles); //Delete all files - webserver.on("/wifioff", turnWifiOff); //Turn off AP Wifi - webserver.on("/configure", handleConfigure); //Show the Configure Page - webserver.on("/saveconfig", handleSaveConfig);//Show the Configure Page - webserver.on("/reset", handleSystemReset); //Reset Device - webserver.begin(); - digitalWrite(LED_BUILTIN, LOW); - } - onPinCount = 0; -} - -void turnWifiOff() { - sendHeader(); - webserver.sendContent("Wifi Turned Off. Return to main screen when reconnected."); - webserver.sendContent(getBodyEnd()); - webserver.sendContent(""); - webserver.client().stop(); - fileServerOn = false; - digitalWrite(LED_BUILTIN, HIGH); - WiFi.softAPdisconnect(true); - ESP.reset(); -} - -void sendHeader() { - webserver.sendHeader("Cache-Control", "no-cache, no-store"); - webserver.sendHeader("Pragma", "no-cache"); - webserver.sendHeader("Expires", "-1"); - webserver.setContentLength(CONTENT_LENGTH_UNKNOWN); - webserver.send(200, "text/html", ""); - webserver.sendContent(FPSTR(HEAD_TITLE)); - webserver.sendContent(FPSTR(BODY_MENU)); -} - -String getBodyEnd() { - String html = FPSTR(BODY_END); - html.replace("%VERSION%", String(VERSION)); - return html; -} - -void sendFooter() { - webserver.sendContent(getBodyEnd()); - webserver.sendContent(""); - webserver.client().stop(); -} - -String getFileName() { - return "QL-" + String(ESP.getChipId(), HEX) + "-"; } -void handleConfigure() { - sendHeader(); - - String form = FPSTR(CONFIG_FORM); - form.replace("%CRAFTNAME%", String(craftname)); - - String isImperialChecked = ""; - if (IMPERIAL_UNITS) { - isImperialChecked = "checked='checked'"; - } - form.replace("%USEIMPERIALCHECKED%", isImperialChecked); - - String isUsePwmChecked = ""; - if (USE_PWM_ARM) { - isUsePwmChecked = "checked='checked'"; - } - form.replace("%USEPWMCHECKED%", isUsePwmChecked); - - webserver.sendContent(form); - - sendFooter(); -} - -void handleSaveConfig() { - String temp = webserver.arg("craftname_form"); - temp.toCharArray(craftname, sizeof(temp)); - IMPERIAL_UNITS = webserver.hasArg("use_imperial_form"); - USE_PWM_ARM = webserver.hasArg("use_pwm_arm_form"); - - writeConfig(); - redirectHome(); -} - -void redirectHome() { - // Send them back to the Root Directory - webserver.sendHeader("Location", String("/"), true); - webserver.sendHeader("Cache-Control", "no-cache, no-store"); - webserver.sendHeader("Pragma", "no-cache"); - webserver.sendHeader("Expires", "-1"); - webserver.send(302, "text/plain", ""); - webserver.client().stop(); - delay(1000); -} - -void showFiles() { - - if (fsInit == false) { - webserver.send(200, "text/html", "Error: Filesystem failed to init!"); +void loop() { +#ifdef WEB_INTERFACE + if (webInterfaceOn) { + webInterfaceLoop(); return; } - - sendHeader(); - - String webpage = "

QLiteOSD v" + String(VERSION) + " GPS Log Files

    "; - - Dir dir = SPIFFS.openDir("/"); - String lastFileNum = String(""); - while (dir.next()) { - if (dir.fileName() == CONFIG) { - continue; // don't look at the config file - } - String fileNum = dir.fileName(); - if (lastFileNum == fileNum) { - break; //In the chance that there is a duplicate at the end, break - } - lastFileNum = fileNum; - String fileName = fileNum; - fileName.replace("/", ""); - File file = dir.openFile("r"); - time_t time = 0; - file.readBytes((char *)&time, sizeof(time_t)); - fileName = getFileName() + String(time) + ".gpx"; - webpage += "
  • " + fileName + "   " + fileSize(file.size()) + "  " + String(time) + "
    • "; - }; - - FSInfo fsInfo; - SPIFFS.info(fsInfo); - - webpage += "
\n"; - webpage += "Space Used: " + fileSize(fsInfo.usedBytes) + " | "; - webpage += "Free Space: " + fileSize(fsInfo.totalBytes) + ""; - webpage += "

Delete All Files"; - webpage += ""; - - webserver.sendContent(webpage); - - sendFooter(); -} - -String fileSize(int bytes) { - String fsize = ""; - if (bytes < 1024) fsize = String(bytes) + " B"; - else if (bytes < (1024 * 1024)) fsize = roundValue(String(bytes / 1024.0, 3)) + " KB"; - else if (bytes < (1024 * 1024 * 1024)) fsize = roundValue(String(bytes / 1024.0 / 1024.0, 3)) + " MB"; - else fsize = roundValue(String(bytes / 1024.0 / 1024.0 / 1024.0, 3)) + " GB"; - return fsize; -} - -String roundValue(String inValue) { - float x = inValue.toFloat(); - long f = (long)(x * 10L); - x = (float)f / 10.0; - return String(x, 1); -} - -void downloadFile() { - static const char *gpxcloser = "\n\n"; - - if (webserver.args() > 0) { - if (webserver.hasArg("download")) { - String filename = webserver.arg(0); - File rawDataFile = SPIFFS.open(filename, "r"); - time_t startTime = 0; - rawDataFile.readBytes((char *)&startTime, sizeof(uint64_t)); - String nameAndTimeStamp = getFileName() + String(startTime); - WiFiClient client = webserver.client(); - size_t fileSize = rawDataFile.size(); - size_t numFrames = (fileSize / sizeof(GPS_LOG_FRAME)); - client.print("HTTP/1.1 200 OK\r\n"); - client.print("Content-Disposition: attachment; filename=" + nameAndTimeStamp + ".gpx\r\n"); - client.print("Content-Type: application/octet-stream\r\n"); - client.print("Connection: close\r\n"); - client.print("Access-Control-Allow-Origin: *\r\n"); - client.print("\r\n"); - String gpxheader = "\n\n\tQLiteOSD v" + String(VERSION) + - "\n\t" + nameAndTimeStamp + "1\n"; - client.print(gpxheader); - - char buf[sizeof("0000-00-00T00:00:00.000Z") + 5]; - char fullbuf[sizeof("\t\t0000000.000000.000") + 30]; - GPS_LOG_FRAME logData; - for (size_t i = 0; i < numFrames; i++) { - String gpxFrame; - time_t currentTime = startTime + (i / 2); - strftime(buf, sizeof(buf), "%Y-%m-%dT%H:%M:%S", gmtime(¤tTime)); - char *msecVal = ".000"; - if (i % 2 != 0) { //Currently hardcoded for 500 ms intervals - msecVal = ".500"; - } - String fullTime = String(buf) + String(msecVal) + "Z"; - rawDataFile.readBytes((char *)&logData, sizeof(GPS_LOG_FRAME)); - sprintf(fullbuf, "\t\t%f%f%f\n", logData.latitude, logData.longitude, logData.altitude, fullTime.c_str(), logData.speed, logData.heading); - client.write(fullbuf); - } - client.write(gpxcloser); - client.write("\n"); - client.stop(); - rawDataFile.close(); - } - } -} - -void deleteFiles() { - logRemoveOldFiles(0); - delay(1000); - webserver.sendHeader("Location", String("/"), true); - webserver.sendHeader("Cache-Control", "no-cache, no-store"); - webserver.sendHeader("Pragma", "no-cache"); - webserver.sendHeader("Expires", "-1"); - webserver.send(302, "text/plain", ""); - webserver.client().stop(); -} #endif + + static uint32_t lastLoopTime = 0; + -#ifdef ESP8266 - -void handleSystemReset() { - logOnDebug("Reset System Configuration"); - if (SPIFFS.format()) { - redirectHome(); - ESP.restart(); - } -} - + craftState.sample(); -void writeConfig() { - // Save settings to file for playback on power up. - File f = SPIFFS.open(CONFIG, "w"); - if (!f) { - logOnDebug("File open failed!"); - } else { - logOnDebug("Saving settings now..."); - f.println("craftname=" + String(craftname)); - f.println("IMPERIAL_UNITS=" + String(IMPERIAL_UNITS)); - f.println("USE_PWM_ARM=" + String(USE_PWM_ARM)); + uint32_t currentLoopTime = millis(); + if (currentLoopTime - lastLoopTime >= TICK_INTERVAL) { + lastLoopTime = currentLoopTime/* + (currentLoopTime-lastLoopTime-TICK_INTERVAL) */; + tick(); } - f.close(); - readConfig(); -} -void readConfig() { - if (SPIFFS.exists(CONFIG) == false) { - logOnDebug("Settings File does not yet exists."); - writeConfig(); - return; - } - File fr = SPIFFS.open(CONFIG, "r"); - String line; - while (fr.available()) { - line = fr.readStringUntil('\n'); - if (line.indexOf("craftname=") >= 0) { - String temp = line.substring(line.lastIndexOf("craftname=") + 10); - temp.trim(); - temp.toCharArray(craftname, sizeof(temp)); - logOnDebug("craftname: " + String(craftname)); - } - if (line.indexOf("IMPERIAL_UNITS=") >= 0) { - IMPERIAL_UNITS = line.substring(line.lastIndexOf("IMPERIAL_UNITS=") + 15).toInt(); - logOnDebug("IMPERIAL_UNITS: " + String(IMPERIAL_UNITS)); - } - if (line.indexOf("USE_PWM_ARM=") >= 0) { - USE_PWM_ARM = line.substring(line.lastIndexOf("USE_PWM_ARM=") + 12).toInt(); - logOnDebug("USE_PWM_ARM: " + String(USE_PWM_ARM)); - } +#ifdef LOG_GPS + if (gpsLogging) { + gpsLogLoop(); } - fr.close(); +#endif } -#endif \ No newline at end of file diff --git a/QLiteOSD/config.h b/QLiteOSD/config.h deleted file mode 100644 index 56f9829..0000000 --- a/QLiteOSD/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * QLiteOSD is an simple OSD for DJI FPV System: - * This is an Arduino project that handles basic OSD functions - * from BMP280 to a Simple Voltage Sensor to feed it - * to DJI FPV System. - * - * ------------------------------------------------ - * - * Copyright (C) 2024 David Payne - * - * This software is based on and uses software published by Paul Kurucz (pkuruz):opentelem_to_bst_bridge - * as well as software d3ngit : djihdfpv_mavlink_to_msp_V2 and crashsalot : VOT_to_DJIFPV - * - * License info: See the LICENSE file at the repo top level - * - * THIS SOFTWARE IS PROVIDED IN AN "AS IS" CONDITION. NO WARRANTIES, - * WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING, BUT NOT LIMITED - * TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE APPLY TO THIS SOFTWARE. THE COMPANY SHALL NOT, - * IN ANY CIRCUMSTANCES, BE LIABLE FOR SPECIAL, INCIDENTAL OR - * CONSEQUENTIAL DAMAGES, FOR ANY REASON WHATSOEVER. - * - */ - -#define ESP8266 // Uncommment this line if using the ESP8266 (Wemos D1 Mini) -#define USE_GPS //comment out to disable. Reads and displays GPS data - requires Nano 328 due to file size -#if defined(ESP8266) && defined(USE_GPS) // do not remove or comment this line out -#define LOG_GPS //uncomment to log position and altitude data to the internal filesystem (requires a pushbutton to be added to switch to wifi mode) -#endif -//#define DEBUG // uncomment this line to debug in Serial Monitor - -//******************************************************************** -// These settings are the defaults and are only loaded the first run. -// When the values are updated in the web interface they are retained -// until a Reset from the web interface. - -char craftname[15] = "QLiteOSD"; // Do not make larger than 14 characters -boolean IMPERIAL_UNITS = true; // Set to false to see units in Metric -boolean USE_PWM_ARM = false; // pin D5 ESP8266 -- If commented out arming will occure with altitude change - diff --git a/QLiteOSD/src/MSP_OSD.cpp b/QLiteOSD/src/MSP_OSD.cpp new file mode 100644 index 0000000..e6ee267 --- /dev/null +++ b/QLiteOSD/src/MSP_OSD.cpp @@ -0,0 +1,155 @@ + +#include "MSP_OSD.h" +#include "craft.h" + +MspOSD mspOsd; + +void MspOSD::init() { + msp.begin(mspSerial); +} + +void MspOSD::sendCraftMSP() { + //MSP_FC_VARIANT + msp_fc_variant_t fc_variant; + memcpy(fc_variant.flightControlIdentifier, FC_FIRMWARE_IDENTIFIER, 4); + msp.send(MSP_FC_VARIANT, &fc_variant, sizeof(fc_variant)); + + //MSP_FC_VERSION + msp_fc_version_t fc_version; + fc_version.versionMajor = 4; + fc_version.versionMinor = 1; + fc_version.versionPatchLevel = 1; + msp.send(MSP_FC_VERSION, &fc_version, sizeof(fc_version)); + + //MSP_NAME + msp_name_t name; + memcpy(name.craft_name, CRAFT_NAME, sizeof(CRAFT_NAME)); + msp.send(MSP_NAME, &name, sizeof(name)); + + //MSP_STATUS + msp_status_DJI_t status_DJI; + status_DJI.cycleTime = 0x0080; + status_DJI.i2cErrorCounter = 0; + status_DJI.sensor = 0x23; + status_DJI.configProfileIndex = 0; + status_DJI.averageSystemLoadPercent = 7; + status_DJI.accCalibrationAxisFlags = 0; + status_DJI.DJI_ARMING_DISABLE_FLAGS_COUNT = 20; + status_DJI.djiPackArmingDisabledFlags = (1 << 24); + + status_DJI.flightModeFlags = craftState.flightModeFlags; + status_DJI.armingFlags = 0x0303; + msp.send(MSP_STATUS_EX, &status_DJI, sizeof(status_DJI)); + status_DJI.armingFlags = 0x0000; + msp.send(MSP_STATUS, &status_DJI, sizeof(status_DJI)); + + //MSP_ANALOG + msp_analog_t analog; + analog.vbat = (uint8_t)(craftState.voltage * 10.0f); + analog.rssi = 0; + analog.amperage = 0; + analog.mAhDrawn = 0; + msp.send(MSP_ANALOG, &analog, sizeof(analog)); + + //MSP_BATTERY_STATE + msp_battery_state_t battery_state; + battery_state.amperage = 0; + battery_state.batteryVoltage = (uint16_t)(craftState.voltage * 100.0f); + battery_state.mAhDrawn = 0; + battery_state.batteryCellCount = craftState.getCellCount(); + battery_state.batteryCapacity = craftState.batteryCapacity; + battery_state.batteryState = craftState.batteryState; + battery_state.legacyBatteryVoltage = (uint8_t)(craftState.voltage * 10.0f); + msp.send(MSP_BATTERY_STATE, &battery_state, sizeof(battery_state)); + + //MSP_RAW_GPS + msp_raw_gps_t raw_gps = {}; +#ifdef USE_GPS + raw_gps.lat = (int32_t)(craftState.gps_lat * 10000000.0f); + raw_gps.lon = (int32_t)(craftState.gps_lon * 10000000.0f); + raw_gps.numSat = (uint8_t)craftState.numSats; + raw_gps.alt = (int32_t)craftState.gps_alt; + raw_gps.groundSpeed = (int16_t)(craftState.gps_speed * 100.0f); //in cm/s +#endif + + msp.send(MSP_RAW_GPS, &raw_gps, sizeof(raw_gps)); + + //MSP_COMP_GPS + msp_comp_gps_t comp_gps = {}; +#ifdef USE_GPS + comp_gps.distanceToHome = (int16_t)craftState.distanceToHome; + comp_gps.directionToHome = (int16_t)(craftState.directionToHome - craftState.gps_heading); +#endif + msp.send(MSP_COMP_GPS, &comp_gps, sizeof(comp_gps)); + + //MSP_ATTITUDE + msp_attitude_t attitude; + attitude.pitch = 0; + attitude.roll = 0; + msp.send(MSP_ATTITUDE, &attitude, sizeof(attitude)); + + //MSP_ALTITUDE + msp_altitude_t altitude; + altitude.estimatedActualPosition = (int32_t)roundf(craftState.getRelativeAltitude() * 100.0f); + altitude.estimatedActualVelocity = (int16_t)(craftState.climbRate*100.0f); // m/ms to cm/s + msp.send(MSP_ALTITUDE, &altitude, sizeof(altitude)); + + // Unused + // msp_status_BF_t status_BF; + + //MSP_OSD_CONFIG + msp_osd_config.units = USE_IMPERIAL_UNITS; + msp.send(MSP_OSD_CONFIG, &msp_osd_config, sizeof(msp_osd_config)); +} + +#ifdef DEBUG +//*** USED ONLY FOR DEBUG *** +void MspOSD::debugPrint() { + mspSerial.print("\033[2J\033[H"); // Clear serial console, move cursor to beginning + mspSerial.println("**********************************"); + mspSerial.print("Craft Name: "); + mspSerial.println(String(CRAFT_NAME)); + mspSerial.print("Imperial: "); + mspSerial.println(USE_IMPERIAL_UNITS); + mspSerial.print("Flight Mode: "); + mspSerial.println(craftState.flightModeFlags); + mspSerial.print("Voltage: "); + mspSerial.println(craftState.voltage, 1); + mspSerial.print("Cell Count: "); + mspSerial.println(craftState.getCellCount()); + mspSerial.print("Altitude (m): "); + mspSerial.println(craftState.altitude); + mspSerial.print("Relative Altitude (m): "); + mspSerial.println(craftState.getRelativeAltitude()); + mspSerial.print("Climb Rate (m/s): "); + mspSerial.println(craftState.climbRate); + if (USE_PWM_ARM) { + mspSerial.print("PWM Value: "); + mspSerial.println(CraftState::readPWMChannel(PWM_ARM_PIN, 1000, 2000, 0)); + } +#ifdef USE_GPS + mspSerial.print("Lat: "); + mspSerial.println(craftState.gps_lat); + mspSerial.print("Lon: "); + mspSerial.println(craftState.gps_lon); + mspSerial.print("Num Sat: "); + mspSerial.println(craftState.numSats); + mspSerial.print("GPS Alt: "); + mspSerial.println(craftState.gps_alt); + mspSerial.print("Speed: "); + mspSerial.println(craftState.gps_speed); + mspSerial.print("Heading: "); + mspSerial.println(craftState.gps_heading); + mspSerial.print("Home Set: "); + mspSerial.println(craftState.gpsHomeSet); + mspSerial.print("HOME Lat: "); + mspSerial.println(craftState.gps_home_lat, 6); + mspSerial.print("HOME Lon: "); + mspSerial.println(craftState.gps_home_lon, 6); + mspSerial.print("Distance: "); + mspSerial.println(craftState.distanceToHome); + mspSerial.print("Direction Home: "); + mspSerial.println(craftState.directionToHome); +#endif +} +#endif diff --git a/QLiteOSD/MSP_OSD.h b/QLiteOSD/src/MSP_OSD.h similarity index 90% rename from QLiteOSD/MSP_OSD.h rename to QLiteOSD/src/MSP_OSD.h index 7e0bdbd..28de06a 100644 --- a/QLiteOSD/MSP_OSD.h +++ b/QLiteOSD/src/MSP_OSD.h @@ -1,11 +1,15 @@ +#pragma once #include +#include "libraries/MSP.h" +#include "config.h" + #define MSP_OSD_CONFIG 84 //out message Get osd settings - betaflight #define MSP_NAME 10 #define MSP_BATTERY_STATE 130 //out message Connected/Disconnected, Voltage, Current Used struct msp_osd_config_t { - uint8_t osdflags; + uint8_t osd_flags; uint8_t video_system; uint8_t units; uint8_t rssi_alarm; @@ -133,3 +137,30 @@ struct msp_status_DJI_t { uint8_t DJI_ARMING_DISABLE_FLAGS_COUNT; //25 uint32_t djiPackArmingDisabledFlags; //(1 << 24) } __attribute__ ((packed)); + +enum FlightModeFlags { + FLIGHT_UNARMED = 0x00000002, + FLIGHT_ARMED = 0x00000003 +}; + +class MspOSD { +public: + MspOSD() : mspSerial(Serial) {} + void sendCraftMSP(); + void init(); + +#ifdef DEBUG + void debugPrint(); +#endif + + MSP msp; + HardwareSerial& mspSerial; +}; + +extern MspOSD mspOsd; + +#ifdef DEBUG +#define debugLog(inValue) mspOsd.mspSerial.println(inValue) +#else +#define debugLog(inValue) +#endif diff --git a/QLiteOSD/src/config.cpp b/QLiteOSD/src/config.cpp new file mode 100644 index 0000000..4431c08 --- /dev/null +++ b/QLiteOSD/src/config.cpp @@ -0,0 +1,79 @@ +#include "config.h" + +#ifdef WEB_INTERFACE + +#include "filesystem.h" + +void configInit() { + if (!filesystem.exists(CONFIG_FILE_PATH)) { + configWrite(); // Write defaults to config file + }else { + configRead(); + } +} + +// Read values from the config file and set them globally +void configRead() { + File configFile = filesystem.open(CONFIG_FILE_PATH,"r"); + + while(configFile.available()) { + String line = configFile.readStringUntil('\n'); + // Bad O(n^2) search + for (int i = 0; i < CONFIG_VALUE_COUNT; i++) { + if (line.indexOf(String(configValues[i].key)+"=") != 0) { + continue; + } + + int valueStartIndex = strlen(configValues[i].key)+1; + String valueString = line.substring(valueStartIndex); + + switch(configValues[i].type) { + case CONFIG_VALUE_STRING: + if (valueString.length() <= configValues[i].optionalData) { + valueString.trim(); + valueString.toCharArray((char*)configValues[i].globalValue,configValues[i].optionalData); + } + break; + case CONFIG_VALUE_BOOL: + *(bool*)configValues[i].globalValue = (bool)valueString.toInt(); + break; + case CONFIG_VALUE_UINT16: + *(uint16_t*)configValues[i].globalValue = (uint16_t)valueString.toInt(); + break; + case CONFIG_VALUE_UINT8: + *(uint8_t*)configValues[i].globalValue = (uint8_t)valueString.toInt(); + break; + } + + break; + } + } + +} + +// Save configuration values based on what is currently set in memory +void configWrite() { + File configFile = filesystem.open(CONFIG_FILE_PATH,"w"); + + for (int i = 0; i < CONFIG_VALUE_COUNT; i++) { + configFile.printf("%s=",configValues[i].key); + switch(configValues[i].type) { + case CONFIG_VALUE_STRING: + configFile.println(String((char*)configValues[i].globalValue)); + break; + case CONFIG_VALUE_BOOL: + configFile.println(String((int)*(bool*)configValues[i].globalValue)); + break; + case CONFIG_VALUE_UINT16: + configFile.println(String(*(uint16_t*)configValues[i].globalValue)); + break; + case CONFIG_VALUE_UINT8: + configFile.println(String(*(uint8_t*)configValues[i].globalValue)); + break; + } + } + + configFile.close(); +} + +#endif diff --git a/QLiteOSD/src/config.h b/QLiteOSD/src/config.h new file mode 100644 index 0000000..c209a53 --- /dev/null +++ b/QLiteOSD/src/config.h @@ -0,0 +1,169 @@ +/* + * QLiteOSD is an simple OSD for DJI FPV System: + * This is an Arduino project that handles basic OSD functions + * from BMP280 to a Simple Voltage Sensor to feed it + * to DJI FPV System. + * + * ------------------------------------------------ + * + * Copyright (C) 2024 David Payne + * + * This software is based on and uses software published by Paul Kurucz (pkuruz):opentelem_to_bst_bridge + * as well as software d3ngit : djihdfpv_mavlink_to_msp_V2 and crashsalot : VOT_to_DJIFPV + * + * License info: See the LICENSE file at the repo top level + * + * THIS SOFTWARE IS PROVIDED IN AN "AS IS" CONDITION. NO WARRANTIES, + * WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING, BUT NOT LIMITED + * TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE APPLY TO THIS SOFTWARE. THE COMPANY SHALL NOT, + * IN ANY CIRCUMSTANCES, BE LIABLE FOR SPECIAL, INCIDENTAL OR + * CONSEQUENTIAL DAMAGES, FOR ANY REASON WHATSOEVER. + * + */ + +#pragma once + +#include + +#define ESP8266_TARGET // Uncommment this line if using the ESP8266 (Wemos D1 Mini) +#define USE_GPS //comment out to disable. Reads and displays GPS data - requires Nano 328 due to file size + +#if defined(ESP8266_TARGET) +#define WEB_INTERFACE // uncomment to disable the web interface +#endif + +#if defined(WEB_INTERFACE) && defined(USE_GPS) // do not remove or comment this line out +#define LOG_GPS //uncomment to log position and altitude data to the internal filesystem (requires a pushbutton to be added to switch to wifi mode) +#endif +#define DEBUG // uncomment this line to debug in Serial Monitor + +// Hardcoded config +#define VERSION "2.0" +#define BMP_ADDRESS 0x76 // default is 0x77 +#define FC_FIRMWARE_IDENTIFIER "BTFL" +#define CONFIG "/conf.txt" + +#define TICK_INTERVAL 100 // in ms +#define ALTITUDE_UPDATE_INTERVAL 2 // in ticks. TICK_INTERVAL * ALTITUDE_UPDATE_INTERVAL ms +#define LIGHT_UPDATE_INTERVAL 2 // in ticks, TICK_INTERVAL * LIGHT_UPDATE_INTERVAL ms +#define PWM_DISARM_TIME 3000 // in ms + +#ifdef USE_GPS +#define GPS_SATELITE_BLINK_UPDATE_INTERVAL 9 // / in ticks, TICK_INTERVAL * GPS_SATELITE_BLINK_UPDATE_INTERVAL ms +#endif + +#define SEA_LEVEL_PRESSURE 1013.25f + +#define ARM_ALTITUDE 1.5f // 1.5 meters up + +#define ValueR1 7500.0f //7.5K Resistor +#define ValueR2 30000.0f //30K Resistor + +#define GPSBaud 9600 + +#define ANALOG_PIN A0 + +#define PWM_TRIGGER_VALUE 1700 + +#ifdef ESP8266_TARGET +#define arduinoVCC 3.25f //Measured ESP8266 3.3 pin voltage +#define PWM_ARM_PIN D5 +#define gps_RX_pin D8 // swapped in 1.2 to match board +#define gps_TX_pin D7 // swapped in 1.2 to match board +#else +#define arduinoVCC 4.95f //Measured Arduino 5V pin voltage +#define PWM_ARM_PIN 10 +#define gps_RX_pin 4 +#define gps_TX_pin 3 +#endif + +#ifdef WEB_INTERFACE +#define AP_SSID_PREFIX "QLiteOSD" +#define AP_PSK "12345678" + +#define WEB_INTERFACE_BUTTON_PIN D3 +#define WEB_INTERFACE_ENABLE_TICKS 30 // 30 ticks of the button held down to enable the web interface + +#define CONFIG_FILE_PATH "/config.txt" +#endif + +#ifdef LOG_GPS +#define GPS_LOG_INTERVAL 500 // in ms +#define GPS_LOG_SAVE_INTERVAL 10000 // in ms +#define LOG_DIRECTORY_PREFIX "/logs/" +#define GPS_LOG_FILE_LIMIT 10 // Maximum amount of log files +#endif + +// ******************************************************************** +// Config defaults +// +// These settings are the defaults and are only loaded the first run. +// When the values are updated in the web interface they are retained +// until a Reset from the web interface. + +#define CRAFT_NAME_DEFAULT "QLiteOSD" +#define USE_IMPERIAL_UNITS_DEFAULT true +#define USE_PWM_ARM_DEFAULT false + +// Helper macro to map out positions correctly +// X values are 0-26 from left to right +// Y values are 0-15 from top to bottom +#define OSD_POS(x,y) (2048 + x + (y*32)) +#define OSD_HIDDEN 234 + +// General OSD Positions + +#define MAIN_BATT_VOLT_POS OSD_POS(1,2) +#define CROSSHAIRS_POS OSD_POS(14,6) +#define CRAFTNAME_POS OSD_POS(0,0) +#define ALTITUDE_POS OSD_POS(0,6) +#define AVG_CELL_VOLT_POS OSD_POS(1,3) +#define NUM_VARIO_POS OSD_POS(1,7) + + +// GPS OSD Positions + +#ifdef USE_GPS +#define GPS_SATS_POS OSD_POS(26,0) +#define GPS_HOME_DIR_POS OSD_POS(15,1) +#define GPS_HOME_DIST_POS OSD_POS(1,9) +#define GPS_SPEED_POS OSD_POS(1,8) +#define GPS_LAT_POS OSD_POS(0,12) +#define GPS_LON_POS OSD_POS(0,13) +#else +#define GPS_SATS_POS OSD_HIDDEN +#define GPS_HOME_DIR_POS OSD_HIDDEN +#define GPS_HOME_DIST_POS OSD_HIDDEN +#define GPS_SPEED_POS OSD_HIDDEN +#define GPS_LAT_POS OSD_HIDDEN +#define GPS_LON_POS OSD_HIDDEN +#endif + +extern char CRAFT_NAME[15]; // Do not make larger than 14 characters +extern bool USE_IMPERIAL_UNITS; // Set to false to see units in Metric +extern bool USE_PWM_ARM; // pin D5 ESP8266 -- If commented out arming will occure with altitude change + +extern struct msp_osd_config_t msp_osd_config; + +enum configType_e { + CONFIG_VALUE_UINT16, + CONFIG_VALUE_UINT8, + CONFIG_VALUE_BOOL, + CONFIG_VALUE_STRING +}; + +struct configValue_t { + const char* key; + void* globalValue; + configType_e type; + uint32_t optionalData; +}; + +#define CONFIG_VALUE_COUNT 3 +extern const configValue_t configValues[CONFIG_VALUE_COUNT]; + +// config.cpp functions +void configInit(); +void configRead(); +void configWrite(); diff --git a/QLiteOSD/src/config_values.cpp b/QLiteOSD/src/config_values.cpp new file mode 100644 index 0000000..9583d5e --- /dev/null +++ b/QLiteOSD/src/config_values.cpp @@ -0,0 +1,123 @@ +/** + * Contains the data for any dynamic configuration options +*/ +#include "config.h" +#include "MSP_OSD.h" + +const configValue_t configValues[CONFIG_VALUE_COUNT] = { + {"CRAFT_NAME",&CRAFT_NAME,CONFIG_VALUE_STRING,14}, // 14 character limit + {"USE_IMPERIAL_UNITS",&USE_IMPERIAL_UNITS,CONFIG_VALUE_BOOL}, + {"USE_PWM_ARM",&USE_PWM_ARM,CONFIG_VALUE_BOOL} +}; + +char CRAFT_NAME[15] = CRAFT_NAME_DEFAULT; // Do not make larger than 14 characters + +bool USE_IMPERIAL_UNITS = USE_IMPERIAL_UNITS_DEFAULT; // Set to false to see units in Metric + +bool USE_PWM_ARM = USE_PWM_ARM_DEFAULT; + +/** + * Default values for the OSD Values are given here, some OSD elements + * here may not be implemented, so using the web interface for config is reccomended. + **/ +msp_osd_config_t msp_osd_config = { + 0, // osd_flags + 0, // video_system + 0, // units (0 for imperial, 1 for metric) + 0, // rssi_alarm + 0, // cap_alarm + 0, // old_timer_alarm + 56, // osd_item_count + 0, // alt_alarm + OSD_HIDDEN, // osd_rssi_value_pos + MAIN_BATT_VOLT_POS, // osd_main_batt_voltage_pos + CROSSHAIRS_POS, // osd_crosshairs_pos + OSD_HIDDEN, // osd_artificial_horizon_pos + OSD_HIDDEN, // osd_horizon_sidebars_pos + OSD_HIDDEN, // osd_item_timer_1_pos + OSD_HIDDEN, // osd_item_timer_2_pos + OSD_HIDDEN, // osd_flymode_pos + CRAFTNAME_POS, // osd_craft_name_pos + OSD_HIDDEN, // osd_throttle_pos_pos + OSD_HIDDEN, // osd_vtx_channel_pos + OSD_HIDDEN, // osd_current_draw_pos + OSD_HIDDEN, // osd_mah_drawn_pos + GPS_SPEED_POS, // osd_gps_speed_pos + GPS_SATS_POS, // osd_gps_sats_pos + ALTITUDE_POS, // osd_altitude_pos + OSD_HIDDEN, // osd_roll_pids_pos + OSD_HIDDEN, // osd_pitch_pids_pos + OSD_HIDDEN, // osd_yaw_pids_pos + OSD_HIDDEN, // osd_power_pos + OSD_HIDDEN, // osd_pidrate_profile_pos + OSD_HIDDEN, // osd_warnings_pos + AVG_CELL_VOLT_POS, // osd_avg_cell_voltage_pos + GPS_LON_POS, // osd_gps_lon_pos + GPS_LAT_POS, // osd_gps_lat_pos + OSD_HIDDEN, // osd_debug_pos + OSD_HIDDEN, // osd_pitch_angle_pos + OSD_HIDDEN, // osd_roll_angle_pos + OSD_HIDDEN, // osd_main_batt_usage_pos + OSD_HIDDEN, // osd_disarmed_pos + GPS_HOME_DIR_POS, // osd_home_dir_pos + GPS_HOME_DIST_POS, // osd_home_dist_pos + OSD_HIDDEN, // osd_numerical_heading_pos + NUM_VARIO_POS, // osd_numerical_vario_pos + OSD_HIDDEN, // osd_compass_bar_pos + OSD_HIDDEN, // osd_esc_tmp_pos + OSD_HIDDEN, // osd_esc_rpm_pos + OSD_HIDDEN, // osd_remaining_time_estimate_pos + OSD_HIDDEN, // osd_rtc_datetime_pos + OSD_HIDDEN, // osd_adjustment_range_pos + OSD_HIDDEN, // osd_core_temperature_pos + OSD_HIDDEN, // osd_anti_gravity_pos + OSD_HIDDEN, // osd_g_force_pos + OSD_HIDDEN, // osd_motor_diag_pos + OSD_HIDDEN, // osd_log_status_pos + OSD_HIDDEN, // osd_flip_arrow_pos + OSD_HIDDEN, // osd_link_quality_pos + OSD_HIDDEN, // osd_flight_dist_pos + OSD_HIDDEN, // osd_stick_overlay_left_pos + OSD_HIDDEN, // osd_stick_overlay_right_pos + OSD_HIDDEN, // osd_display_name_pos + OSD_HIDDEN, // osd_esc_rpm_freq_pos + OSD_HIDDEN, // osd_rate_profile_name_pos + OSD_HIDDEN, // osd_pid_profile_name_pos + OSD_HIDDEN, // osd_profile_name_pos + OSD_HIDDEN, // osd_rssi_dbm_value_pos + OSD_HIDDEN, // osd_rc_channels_pos + 24, // osd_stat_count + 0, // osd_stat_rtc_date_time + 0, // osd_stat_timer_1 + 0, // osd_stat_timer_2 + 0, // osd_stat_max_speed + 0, // osd_stat_max_distance + 0, // osd_stat_min_battery + 0, // osd_stat_end_battery + 0, // osd_stat_battery + 0, // osd_stat_min_rssi + 0, // osd_stat_max_current + 0, // osd_stat_used_mah + 0, // osd_stat_max_altitude + 0, // osd_stat_blackbox + 0, // osd_stat_blackbox_number + 0, // osd_stat_max_g_force + 0, // osd_stat_max_esc_temp + 0, // osd_stat_max_esc_rpm + 0, // osd_stat_min_link_quality + 0, // osd_stat_flight_distance + 0, // osd_stat_max_fft + 0, // osd_stat_total_flights + 0, // osd_stat_total_time + 0, // osd_stat_total_dist + 0, // osd_stat_min_rssi_dbm + 2, // osd_timer_count + 0, // osd_timer_1 + 0, // osd_timer_2 + 0, // enabledwarnings + 16, // osd_warning_count + 0, // enabledwarnings_1_41_plus + 1, // osd_profile_count + 1, // osdprofileindex + 0, // overlay_radio_mode +}; diff --git a/QLiteOSD/src/craft.cpp b/QLiteOSD/src/craft.cpp new file mode 100644 index 0000000..a024e54 --- /dev/null +++ b/QLiteOSD/src/craft.cpp @@ -0,0 +1,191 @@ +#include "craft.h" +#include "MSP_OSD.h" +#include // May need to adjust for I2C address #define BMP280_ADDRESS (0x76) + +#ifdef USE_GPS +#include +#endif + +CraftState craftState; + +Adafruit_BMP280 bme; // I2C + +#ifdef USE_GPS +TinyGPSPlus gps; +SoftwareSerial gpsSerial(gps_RX_pin, gps_TX_pin); +#endif + +void CraftState::init() { + flightModeFlags = FLIGHT_UNARMED; + batteryCapacity = 2200; + + if (USE_PWM_ARM) { + pinMode(PWM_ARM_PIN, INPUT_PULLUP); + } + + bme.begin(BMP_ADDRESS); //Default Address 0x77 + previousAltitudeReadTime = millis(); + +#ifdef USE_GPS + gpsSerial.begin(GPSBaud); + gpsHomeSet = false; + numSats = 0; + gps_lat = 0.0f; + gps_lon = 0.0f; + gps_home_lat = 0.0f; + gps_home_lon = 0.0f; + distanceToHome = 0.0f; + directionToHome = 0.0f; +#endif + + for (int i = 0; i < 20; i++) { + sample(); // Get initial values from the sensors + delay(100); + } + + read(); + + previous_altitude = altitude; + HomeAlt = altitude; +} + +void CraftState::sample() { + sampleAltitude(); + sampleVoltage(); +} + +void CraftState::read() { + readVoltage(); + readAltitude(); +#ifdef USE_GPS + readGPS(); +#endif +} + +void CraftState::sampleAltitude() { + altitudeSamples += bme.readAltitude(SEA_LEVEL_PRESSURE); + sampleAltitudeCount++; +} + +void CraftState::readAltitude() { + if (sampleAltitudeCount == 0) return; + previous_altitude = altitude; + altitude = altitudeSamples / sampleAltitudeCount; + sampleAltitudeCount = 0; + altitudeSamples = 0.0f; + + uint32_t currentTime = millis(); + climbRate = ((craftState.altitude - craftState.previous_altitude) / (currentTime - previousAltitudeReadTime))/1000.0f; + previousAltitudeReadTime = currentTime; +} + +void CraftState::readVoltage() { + if (sampleVoltageCount == 0) return; + voltage = voltageSamples / sampleVoltageCount; + sampleVoltageCount = 0; + voltageSamples = 0.0f; +} + +void CraftState::sampleVoltage() { + int readValue = analogRead(ANALOG_PIN); + voltageSamples += (readValue * (arduinoVCC / 1024.0f)) * (1.0f + (ValueR2 / ValueR1)); + sampleVoltageCount++; +} + +// Read the number of a specified channel and convert to the range provided. +// If the channel is off, return the default value +volatile int CraftState::readPWMChannel(int channelInput, int minLimit, int maxLimit, int defaultValue) { + int ch = pulseIn(channelInput, HIGH, 30000); + if (ch < 100) return defaultValue; + return map(ch, 1000, 2000, minLimit, maxLimit); +} + +void CraftState::setFlightModeFlags() { + if (USE_PWM_ARM) { + //USE PWM signal to ARM + volatile int pwmValue = readPWMChannel(PWM_ARM_PIN, 1000, 2000, 0); + + if ((flightModeFlags == FLIGHT_UNARMED) && pwmValue >= PWM_TRIGGER_VALUE) { + pwmDisarmTimerStart = 0; + flightModeFlags = FLIGHT_ARMED; + } else if ((flightModeFlags == FLIGHT_ARMED) && pwmValue < PWM_TRIGGER_VALUE) { + + if (pwmDisarmTimerStart == 0) { + pwmDisarmTimerStart = millis(); + }else if (millis() - pwmDisarmTimerStart >= PWM_DISARM_TIME) { + flightModeFlags = FLIGHT_UNARMED; // disarm after a delay + pwmDisarmTimerStart = 0; + } + + } + + } else { + + //USE Altitude to Arm + // flightModeFlags = FLIGHT_ARMED; //Uncomment this to automatically arm on start + + if (flightModeFlags == FLIGHT_UNARMED && getRelativeAltitude() > ARM_ALTITUDE) { // if altitude is 1 meter or more then arm to record + flightModeFlags = FLIGHT_ARMED; // armed to start recording + } + } +} + +#ifdef USE_GPS +void CraftState::readGPS() { + while (gpsSerial.available()) { + gps.encode(gpsSerial.read()); + } + if (!gps.location.isValid()) { + return; + } + + // Make sure that current latitude and longitude don't get reset + float lat = gps.location.lat(); + if (lat != 0.0f) { + gps_lat = lat; + } + float lon = gps.location.lng(); + if (lon != 0.0f) { + gps_lon = lon; + } + + gps_alt = gps.altitude.meters(); + gps_speed = gps.speed.mps(); + gps_heading = gps.course.deg(); + + tm currentTime; + currentTime.tm_year = gps.date.year() - 1900; + currentTime.tm_mon = gps.date.month() - 1; + currentTime.tm_mday = gps.date.day(); + currentTime.tm_hour = gps.time.hour(); + currentTime.tm_min = gps.time.minute(); + currentTime.tm_sec = gps.time.second(); + gps_time = mktime(¤tTime); // Convert the gps time to a unix timestamp + + if (gps.satellites.isValid()) { + numSats = gps.satellites.value(); + } + + // Ensure the position is accurate enough before setting home + if (gpsHomeSet == false && gps.hdop.isValid() && gps.hdop.hdop() < 2) { + gps_home_lat = gps_lat; + gps_home_lon = gps_lon; + gpsHomeSet = true; + } + + if (gpsHomeSet) { + distanceToHome = TinyGPSPlus::distanceBetween(gps_lat, gps_lon, gps_home_lat, gps_home_lon); + directionToHome = TinyGPSPlus::courseTo(gps_lat, gps_lon, gps_home_lat, gps_home_lon); + } +} +#endif + +uint8_t CraftState::getCellCount() { + // Todo map this to a function + if (voltage < 4.3f) return 1; + else if (voltage < 8.5f) return 2; + else if (voltage < 12.7f) return 3; + else if (voltage < 16.9f) return 4; + else if (voltage < 21.1f) return 5; + else return 6; +} diff --git a/QLiteOSD/src/craft.h b/QLiteOSD/src/craft.h new file mode 100644 index 0000000..3b2680f --- /dev/null +++ b/QLiteOSD/src/craft.h @@ -0,0 +1,77 @@ +#pragma once + +#include "config.h" +#include + +#ifdef USE_GPS +#include +#endif + +class CraftState { +private: + float voltageSamples; + uint32_t sampleVoltageCount; + + float altitudeSamples; + uint32_t sampleAltitudeCount; + + uint32_t pwmDisarmTimerStart; + + float previous_altitude; // used to calculate climb rate + uint32_t previousAltitudeReadTime; // in ms + +public: + void init(); + void read(); + void sample(); + void setFlightModeFlags(); + void sampleAltitude(); + void readAltitude(); + void sampleVoltage(); + void readVoltage(); + void readGPS(); + + uint8_t getCellCount(); + + static volatile int readPWMChannel(int channelInput, int minLimit, int maxLimit, int defaultValue); + + inline float getRelativeAltitude() { return altitude - HomeAlt; } + + uint32_t flightModeFlags; // 0x00000002 by default + + float voltage; + uint16_t batteryCapacity; // 2200 by default + uint8_t batteryState; // voltage color 0==white, 1==red + + float climbRate; // in m/s + float altitude; // in meters from sea level + + float HomeAlt; + +#ifdef USE_GPS + bool gpsHomeSet; + + uint32_t numSats; + + float gps_speed; // in m/s + float gps_heading; + + float gps_lon; + float gps_lat; + float gps_alt; + + float gps_home_lon; + float gps_home_lat; + + float distanceToHome; // in meters + float directionToHome; // in degrees + + time_t gps_time; +#endif +}; + +extern CraftState craftState; + +#ifdef USE_GPS +extern SoftwareSerial gpsSerial; +#endif diff --git a/QLiteOSD/src/filesystem.cpp b/QLiteOSD/src/filesystem.cpp new file mode 100644 index 0000000..24a9746 --- /dev/null +++ b/QLiteOSD/src/filesystem.cpp @@ -0,0 +1,23 @@ +#include "filesystem.h" + +#ifdef WEB_INTERFACE + +#include "MSP_OSD.h" + +FS& filesystem = LittleFS; + +void filesystemInit() { + // The standard will format the filesystem if it can't mount, so this should rarely fail + if (!filesystem.begin()) { + debugLog("FS Init Fail!!"); + } +} + +void filesystemFormat() { + if (!filesystem.format()) { + debugLog("FS Format Failed!"); + } +} + +#endif + diff --git a/QLiteOSD/src/filesystem.h b/QLiteOSD/src/filesystem.h new file mode 100644 index 0000000..2696f77 --- /dev/null +++ b/QLiteOSD/src/filesystem.h @@ -0,0 +1,14 @@ +#pragma once +#include "config.h" + +#ifdef WEB_INTERFACE + +#include +#include + +void filesystemInit(); +void filesystemFormat(); + +extern FS& filesystem; + +#endif diff --git a/QLiteOSD/src/gpsLog.cpp b/QLiteOSD/src/gpsLog.cpp new file mode 100644 index 0000000..4000e21 --- /dev/null +++ b/QLiteOSD/src/gpsLog.cpp @@ -0,0 +1,117 @@ +#include "gpsLog.h" + +#ifdef LOG_GPS + +#include "craft.h" +#include "filesystem.h" + +#ifdef DEBUG +#include "MSP_OSD.h" +#endif + +bool gpsLogging = false; + +static uint32_t lastLogTime = 0; +static uint32_t startLogTime = 0; +static File logFile; +static time_t logFileId; + +void gpsLogInit() { + // Create the Log file + gpsLogging = true; + + gps_logfile_header_t header; + header.version = 1; + header.fileStartTime = craftState.gps_time; + + // Make the file name the current gps time, so files can be uniquely identified + logFileId = header.fileStartTime; + + debugLog(String("gpsLog start time: ")+String(logFileId)+String("\nFile start millis: ")+String(millis())); + + logFile = filesystem.open(String(LOG_DIRECTORY_PREFIX)+String(logFileId),"w"); + logFile.write((uint8_t*)&header,sizeof(header)); + + debugLog(String("gpsLog start end time: ")+String(millis())); + + startLogTime = millis(); + lastLogTime = startLogTime; + + gpsLogFrame(); // Log the current flight values +} + +void gpsLogLoop() { + uint32_t currentTime = millis(); + if (currentTime - lastLogTime >= GPS_LOG_INTERVAL) { + lastLogTime = currentTime; + gpsLogFrame(); + } + + static uint32_t lastSaveTime; + if (currentTime - lastSaveTime >= GPS_LOG_SAVE_INTERVAL) { + lastSaveTime = currentTime; + gpsLogSave(); + } +} + +void gpsLogFrame() { + gps_logfile_frame_t frame; + + frame.timeOffset = millis() - startLogTime; + frame.altitude = craftState.altitude; + frame.heading = craftState.gps_heading; + frame.latitude = craftState.gps_lat; + frame.longitude = craftState.gps_lon; + frame.speed = craftState.gps_speed; + + debugLog(String("gpsLog start time: ")+String(millis())); + logFile.write((uint8_t*)&frame,sizeof(frame)); + debugLog(String("gpsLog end time: ")+String(millis())); +} + +// Flush the file +void gpsLogSave() { + debugLog(String("gpsLog flush start time: ")+String(millis())); + logFile.flush(); + debugLog(String("gpsLog flush end time: ")+String(millis())); +} + +void gpsLogEnd() { + logFile.close(); + gpsLogging = false; +} + +// Assumes that all log files are their unix timestamp number +void gpsLogDeleteOldFiles() { + int currentNumFiles = 0; + + { + Dir logDir = filesystem.openDir(LOG_DIRECTORY_PREFIX); + while (logDir.next()) { + if (logDir.isDirectory()) { + continue; + } + + currentNumFiles++; + } + } // Make sure the directory destructor is called before continuing + + if (currentNumFiles <= GPS_LOG_FILE_LIMIT) { + return; + } + + for (int i = 0; i + +struct gps_logfile_header_t { + uint32_t version; + time_t fileStartTime; // unix timestamp +}; + +struct gps_logfile_frame_t { + uint32_t timeOffset; // ms since flight started + float latitude; + float longitude; + float altitude; //in meters + float heading; // in degrees + float speed; // in meters/second +}; + +void gpsLogInit(); +void gpsLogLoop(); +void gpsLogFrame(); +void gpsLogSave(); +void gpsLogEnd(); +void gpsLogDeleteOldFiles(); + +extern bool gpsLogging; + +#endif diff --git a/libraries/MSP/MSP.cpp b/QLiteOSD/src/libraries/MSP.cpp similarity index 100% rename from libraries/MSP/MSP.cpp rename to QLiteOSD/src/libraries/MSP.cpp diff --git a/libraries/MSP/MSP.h b/QLiteOSD/src/libraries/MSP.h similarity index 100% rename from libraries/MSP/MSP.h rename to QLiteOSD/src/libraries/MSP.h diff --git a/QLiteOSD/src/web_interface.cpp b/QLiteOSD/src/web_interface.cpp new file mode 100644 index 0000000..f744bb0 --- /dev/null +++ b/QLiteOSD/src/web_interface.cpp @@ -0,0 +1,292 @@ +#include "web_interface.h" + +#ifdef WEB_INTERFACE + +#include "craft.h" +#include "filesystem.h" +#include "gpsLog.h" + +#include +#include + +bool webInterfaceOn = false; + +// todo check if we should allocate this on the heap instead +ESP8266WebServer webserver(80); + +void webInterfaceInit() { +#ifdef LOG_GPS + // the gps communication must be stopped to start wifi communication + if (gpsLogging) { + gpsLogEnd(); + } + gpsSerial.end(); +#endif + + //Begin fileserver + webInterfaceOn = true; + + WiFi.softAP(String(AP_SSID_PREFIX)+"-"+String(ESP.getChipId(), HEX), String(AP_PSK)); + + webserver.on("/", webInterfaceHome); //Show all logged gps files +#ifdef LOG_GPS + webserver.on("/download", webInterfaceDownloadLog); //Convert and download a gpx file + webserver.on("/delete", webInterfaceDeleteLog); //Delete the log given by the parameter +#endif + webserver.on("/wifioff", webInterfaceWifiOff); //Turn off AP Wifi + webserver.on("/configure", webInterfaceConfigure); //Show the Configure Page + webserver.on("/configsave", webInterfaceConfigSave);//Show the Configure Page + webserver.on("/reset", webInterfaceSystemFormat); //Reset Device + webserver.begin(); + + digitalWrite(LED_BUILTIN, LOW); +} + +void webInterfaceLoop() { + webserver.handleClient(); +} + +void webInterfaceSendHeader() { + webserver.sendHeader("Cache-Control", "no-cache, no-store"); + webserver.sendHeader("Pragma", "no-cache"); + webserver.sendHeader("Expires", "-1"); + webserver.chunkedResponseModeStart(200,"text/html"); +// webserver.setContentLength(CONTENT_LENGTH_UNKNOWN); +// webserver.send(200, "text/html", ""); + webserver.sendContent(FPSTR(HEAD_TITLE)); + webserver.sendContent(FPSTR(BODY_MENU)); +} + +void webInterfaceSendFooter() { + webserver.sendContent(FPSTR(BODY_END)); +// webserver.sendContent(""); + webserver.chunkedResponseFinalize(); + webserver.client().stop(); +} + +void webInterfaceRedirect(const char* url) { + webserver.sendHeader("Location", url, true); + webserver.sendHeader("Cache-Control", "no-cache, no-store"); + webserver.sendHeader("Pragma", "no-cache"); + webserver.sendHeader("Expires", "-1"); + webserver.send(302, "text/plain", ""); + webserver.client().stop(); + delay(1000); +} + +static String getFileSizeString(size_t sizeInBytes) { + if (sizeInBytes < 1024) return String(sizeInBytes) + " B"; + else if (sizeInBytes < (1024 * 1024)) return String(sizeInBytes / 1024.0f, 1) + " KB"; + else if (sizeInBytes < (1024 * 1024 * 1024)) return String(sizeInBytes / 1024.0f / 1024.0f, 1) + " MB"; + else return String(sizeInBytes / 1024.0f / 1024.0f / 1024.0f, 3) + " GB"; +} + +void webInterfaceHome() { + webInterfaceSendHeader(); + +#ifdef LOG_GPS + + webserver.sendContent("

QLiteOSD GPS Log Files

    "); + + Dir logDir = filesystem.openDir(LOG_DIRECTORY_PREFIX); + while (logDir.next()) { + if (logDir.isDirectory()) { + continue; + } + + // Reads the file header, if needed for the webpage + // gps_logfile_header_t header; + // File logFile = logDir.openFile("r"); + // logFile.readBytes((char*)&header,sizeof(header)); + // logFile.close(); + + String name = logDir.fileName(); + webserver.sendContent("
  • "+name+" " + +getFileSizeString(logDir.fileSize())+" | Delete
    • "); + } + + webserver.sendContent("
"); + + webserver.sendContent(FPSTR(LOGFILES_JAVASCRIPT)); + +#endif + + FSInfo fsInfo; + filesystem.info(fsInfo); + + String spaceString = String("Space Used: ")+getFileSizeString(fsInfo.usedBytes)+" | Free Space: "; + spaceString += getFileSizeString(fsInfo.totalBytes - fsInfo.usedBytes)+""; + + webserver.sendContent(spaceString); + + webInterfaceSendFooter(); +} + +void webInterfaceConfigure() { + webInterfaceSendHeader(); + + String form = FPSTR(CONFIG_FORM); + + for (int i = 0; i < CONFIG_VALUE_COUNT; i++) { + String replacementKey = String("%")+configValues[i].key+"%"; + + switch (configValues[i].type) { + case CONFIG_VALUE_STRING: + form.replace(replacementKey,String((char*)configValues[i].globalValue)); + break; + case CONFIG_VALUE_BOOL: + form.replace(replacementKey,(*(bool*)configValues[i].globalValue) ? "checked='checked'" : ""); + break; + case CONFIG_VALUE_UINT16: + form.replace(replacementKey,String(*(uint16_t*)configValues[i].globalValue)); + break; + case CONFIG_VALUE_UINT8: + form.replace(replacementKey,String(*(uint8_t*)configValues[i].globalValue)); + break; + } + } + + webserver.sendContent(form); + + webInterfaceSendFooter(); +} + +void webInterfaceConfigSave() { + for (int i = 0; i < CONFIG_VALUE_COUNT; i++) { + String argumentName = String(configValues[i].key)+"_FORM"; + + if (configValues[i].type == CONFIG_VALUE_BOOL) { + *(bool*)configValues[i].globalValue = webserver.hasArg(argumentName); + continue; + } + + if (!webserver.hasArg(argumentName)) { + continue; + } + + String argValue = webserver.arg(argumentName); + switch(configValues[i].type) { + case CONFIG_VALUE_STRING: + argValue.toCharArray((char*)configValues[i].globalValue,configValues[i].optionalData); + break; + case CONFIG_VALUE_UINT16: + *(uint16_t*)configValues[i].globalValue = (uint16_t)argValue.toInt(); + break; + case CONFIG_VALUE_UINT8: + *(uint8_t*)configValues[i].globalValue = (uint8_t)argValue.toInt(); + break; + } + } + + configWrite(); + webInterfaceRedirect("/"); +} + +static void resetSystem() { + webserver.stop(); + digitalWrite(LED_BUILTIN, HIGH); + WiFi.softAPdisconnect(true); + ESP.reset(); +} + +void webInterfaceWifiOff() { + webInterfaceSendHeader(); + webserver.sendContent("

WiFi Turned Off and OSD rebooted. Return to main screen when reconnected.

"); + webInterfaceSendFooter(); + resetSystem(); +} + +void webInterfaceSystemFormat() { + webInterfaceSendHeader(); + + if (filesystem.format()) { + webserver.sendContent("

Filesystem and config successfully reset. OSD has been rebooted. Return to main screen when reconnected.

"); + + webInterfaceSendFooter(); + resetSystem(); + }else{ + webserver.sendContent("

Filesystem failed to format! Please format it manually!

"); + webInterfaceSendFooter(); + } +} + +#ifdef LOG_GPS +static void sendFileError(const String& error) { + webInterfaceSendHeader(); + webserver.sendContent(error); + webInterfaceSendFooter(); + return; +} + +void webInterfaceDownloadLog() { + if (!webserver.hasArg("file")) { + sendFileError("No file given!"); + return; + } + + String fileName = webserver.arg("file"); + File logFile = filesystem.open(String(LOG_DIRECTORY_PREFIX)+fileName,"r"); + if (!logFile) { + sendFileError("File failed to open!"); + return; + } + if (logFile.size() <= sizeof(gps_logfile_header_t)) { + sendFileError("File has no data!"); + return; + } + + // debug: send the raw file + // webserver.streamFile(logFile,"application/octet-stream"); + // webserver.client().stop(); + // return; + + gps_logfile_header_t header; + logFile.readBytes((char*)&header,sizeof(header)); + size_t numFrames = ((logFile.size() - sizeof(header)) / sizeof(gps_logfile_frame_t)); + + WiFiClient& client = webserver.client(); + client.print("HTTP/1.1 200 OK\r\n"); + client.print("Content-Disposition: attachment; filename=QLiteOSD_Path_" + fileName + ".gpx\r\n"); + client.print("Content-Type: application/octet-stream\r\n"); + client.print("Connection: close\r\n"); + client.print("Access-Control-Allow-Origin: *\r\n"); + client.print("\r\n"); + + client.print(String("\n\n\tQLiteOSD v" VERSION) + + "\n\tQLiteOSD_Path_" + fileName + "1\n"); + + for (size_t i = 0; i < numFrames || logFile.available(); i++) { + gps_logfile_frame_t frame; + logFile.readBytes((char*)&frame,sizeof(frame)); + + client.printf("\t\t%f",frame.latitude,frame.longitude,frame.altitude); + + time_t currentTime = header.fileStartTime + (time_t)floorf(frame.timeOffset/1000.0f); + + char timeBuffer[sizeof("0000-00-00T00:00:00.000Z") + 5]; + strftime(timeBuffer,sizeof(timeBuffer),"%Y-%m-%dT%H:%M:%S", gmtime(¤tTime)); + + client.printf("%f%f\n",timeBuffer,frame.timeOffset%1000,frame.speed,frame.heading); + } + + client.print("\n\n\n"); + client.stop(); + logFile.close(); +} + +void webInterfaceDeleteLog() { + if (!webserver.hasArg("file")) { + sendFileError("No file given!"); + return; + } + + String fileName = webserver.arg("file"); + if (!filesystem.remove(String(LOG_DIRECTORY_PREFIX)+fileName)) { + sendFileError("LogFile "+fileName+" failed to delete!"); + } + + webInterfaceRedirect("/"); +} +#endif + +#endif diff --git a/QLiteOSD/src/web_interface.h b/QLiteOSD/src/web_interface.h new file mode 100644 index 0000000..7849ed8 --- /dev/null +++ b/QLiteOSD/src/web_interface.h @@ -0,0 +1,55 @@ +/* + * QLiteOSD is an simple OSD for DJI FPV System: + * This is an Arduino project that handles basic OSD functions + * from BMP280 to a Simple Voltage Sensor to feed it + * to DJI FPV System. + * + * ------------------------------------------------ + * + * Copyright (C) 2023 David Payne + * + * This software is based on and uses software published by Paul Kurucz (pkuruz):opentelem_to_bst_bridge + * as well as software d3ngit : djihdfpv_mavlink_to_msp_V2 and crashsalot : VOT_to_DJIFPV + * + * License info: See the LICENSE file at the repo top level + * + * THIS SOFTWARE IS PROVIDED IN AN "AS IS" CONDITION. NO WARRANTIES, + * WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING, BUT NOT LIMITED + * TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE APPLY TO THIS SOFTWARE. THE COMPANY SHALL NOT, + * IN ANY CIRCUMSTANCES, BE LIABLE FOR SPECIAL, INCIDENTAL OR + * CONSEQUENTIAL DAMAGES, FOR ANY REASON WHATSOEVER. + * + */ +#pragma once +#include "config.h" + +#ifdef WEB_INTERFACE + +#include + +void webInterfaceInit(); +void webInterfaceLoop(); +void webInterfaceSendHeader(); +void webInterfaceSendFooter(); +void webInterfaceRedirect(const char* url); +void webInterfaceHome(); +void webInterfaceConfigure(); +void webInterfaceConfigSave(); +void webInterfaceWifiOff(); +void webInterfaceSystemFormat(); + +#ifdef LOG_GPS +void webInterfaceDownloadLog(); +void webInterfaceDeleteLog(); +#endif + +extern bool webInterfaceOn; + +extern const char* HEAD_TITLE PROGMEM; +extern const char* BODY_MENU PROGMEM; +extern const char* BODY_END PROGMEM; +extern const char* CONFIG_FORM PROGMEM; +extern const char* LOGFILES_JAVASCRIPT PROGMEM; + +#endif diff --git a/QLiteOSD/web_interface.h b/QLiteOSD/src/web_interface_html.cpp similarity index 83% rename from QLiteOSD/web_interface.h rename to QLiteOSD/src/web_interface_html.cpp index d864525..b6b70f1 100644 --- a/QLiteOSD/web_interface.h +++ b/QLiteOSD/src/web_interface_html.cpp @@ -1,29 +1,10 @@ -/* - * QLiteOSD is an simple OSD for DJI FPV System: - * This is an Arduino project that handles basic OSD functions - * from BMP280 to a Simple Voltage Sensor to feed it - * to DJI FPV System. - * - * ------------------------------------------------ - * - * Copyright (C) 2023 David Payne - * - * This software is based on and uses software published by Paul Kurucz (pkuruz):opentelem_to_bst_bridge - * as well as software d3ngit : djihdfpv_mavlink_to_msp_V2 and crashsalot : VOT_to_DJIFPV - * - * License info: See the LICENSE file at the repo top level - * - * THIS SOFTWARE IS PROVIDED IN AN "AS IS" CONDITION. NO WARRANTIES, - * WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING, BUT NOT LIMITED - * TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE APPLY TO THIS SOFTWARE. THE COMPANY SHALL NOT, - * IN ANY CIRCUMSTANCES, BE LIABLE FOR SPECIAL, INCIDENTAL OR - * CONSEQUENTIAL DAMAGES, FOR ANY REASON WHATSOEVER. - * - */ +#include "config.h" +#ifdef WEB_INTERFACE -static const char HEAD_TITLE[] PROGMEM = "" +#include + +const char* HEAD_TITLE PROGMEM = "" "" "" "" @@ -116,7 +97,7 @@ static const char HEAD_TITLE[] PROGMEM = "< " " " "; -static const char BODY_MENU[] PROGMEM = "" +const char* BODY_MENU PROGMEM = "" "
" "

QLiteOSD

" "
" @@ -135,7 +116,7 @@ static const char BODY_MENU[] PROGMEM = "" " " "

"; -static const char BODY_END[] PROGMEM = "


QLiteOSD v%VERSION%

" +const char* BODY_END PROGMEM = "


QLiteOSD v" VERSION "

" " " ""; -static const char CONFIG_FORM[] PROGMEM = "

Configuration:

" - "

" - "

Use Imperial Units

" - "

Arm with PWM Switch (D5 pin)

" +const char* CONFIG_FORM PROGMEM = "

Configuration:

" + "

" + "

" + "

" "
"; + +const char* LOGFILES_JAVASCRIPT PROGMEM = ""; + +#endif diff --git a/libraries/MSP/readme.md b/libraries/MSP/readme.md deleted file mode 100644 index 8b13789..0000000 --- a/libraries/MSP/readme.md +++ /dev/null @@ -1 +0,0 @@ - From f59dbabff69b9546cb6df907ea1312df845414f9 Mon Sep 17 00:00:00 2001 From: jdflyer Date: Thu, 18 Jul 2024 13:02:45 -0700 Subject: [PATCH 2/7] Add Config for OSD Positions; fix webserver bugs --- QLiteOSD/QLiteOSD.ino | 4 +- QLiteOSD/src/config.cpp | 6 + QLiteOSD/src/config.h | 47 +++---- QLiteOSD/src/config_values.cpp | 44 +++++-- QLiteOSD/src/craft.cpp | 2 +- QLiteOSD/src/web_interface.cpp | 66 +++++++--- QLiteOSD/src/web_interface.h | 4 + QLiteOSD/src/web_interface_html.cpp | 196 +++++++++++++++++++++++++++- 8 files changed, 310 insertions(+), 59 deletions(-) diff --git a/QLiteOSD/QLiteOSD.ino b/QLiteOSD/QLiteOSD.ino index 33ba7ac..f875c33 100644 --- a/QLiteOSD/QLiteOSD.ino +++ b/QLiteOSD/QLiteOSD.ino @@ -105,10 +105,10 @@ void tick() { if (flight_ticks % GPS_SATELITE_BLINK_UPDATE_INTERVAL == 0) { if (!craftState.gpsHomeSet) { static bool satsOn = false; - msp_osd_config.osd_gps_sats_pos = satsOn ? GPS_SATS_POS : OSD_HIDDEN; + msp_osd_config.osd_gps_sats_pos = satsOn ? OSD_GPS_SATS_POS : OSD_HIDDEN; satsOn = !satsOn; }else { - msp_osd_config.osd_gps_sats_pos = GPS_SATS_POS; + msp_osd_config.osd_gps_sats_pos = OSD_GPS_SATS_POS; } } #endif diff --git a/QLiteOSD/src/config.cpp b/QLiteOSD/src/config.cpp index 4431c08..538a90f 100644 --- a/QLiteOSD/src/config.cpp +++ b/QLiteOSD/src/config.cpp @@ -43,6 +43,9 @@ void configRead() { case CONFIG_VALUE_UINT8: *(uint8_t*)configValues[i].globalValue = (uint8_t)valueString.toInt(); break; + case CONFIG_VALUE_FLOAT: + *(float*)configValues[i].globalValue = valueString.toFloat(); + break; } break; @@ -70,6 +73,9 @@ void configWrite() { case CONFIG_VALUE_UINT8: configFile.println(String(*(uint8_t*)configValues[i].globalValue)); break; + case CONFIG_VALUE_FLOAT: + configFile.println(String(*(float*)configValues[i].globalValue)); + break; } } diff --git a/QLiteOSD/src/config.h b/QLiteOSD/src/config.h index c209a53..7bb9bb9 100644 --- a/QLiteOSD/src/config.h +++ b/QLiteOSD/src/config.h @@ -67,12 +67,12 @@ #define PWM_TRIGGER_VALUE 1700 #ifdef ESP8266_TARGET -#define arduinoVCC 3.25f //Measured ESP8266 3.3 pin voltage +#define BOARD_VCC_DEFAULT 3.25f //Measured ESP8266 3.3 pin voltage #define PWM_ARM_PIN D5 #define gps_RX_pin D8 // swapped in 1.2 to match board #define gps_TX_pin D7 // swapped in 1.2 to match board #else -#define arduinoVCC 4.95f //Measured Arduino 5V pin voltage +#define BOARD_VCC_DEFAULT 4.95f //Measured Arduino 5V pin voltage #define PWM_ARM_PIN 10 #define gps_RX_pin 4 #define gps_TX_pin 3 @@ -114,35 +114,37 @@ // General OSD Positions -#define MAIN_BATT_VOLT_POS OSD_POS(1,2) -#define CROSSHAIRS_POS OSD_POS(14,6) -#define CRAFTNAME_POS OSD_POS(0,0) -#define ALTITUDE_POS OSD_POS(0,6) -#define AVG_CELL_VOLT_POS OSD_POS(1,3) -#define NUM_VARIO_POS OSD_POS(1,7) +#define MAIN_BATT_VOLT_POS_DEFAULT OSD_POS(1,2) +#define CROSSHAIRS_POS_DEFAULT OSD_POS(14,6) +#define CRAFTNAME_POS_DEFAULT OSD_POS(0,0) +#define ALTITUDE_POS_DEFAULT OSD_POS(0,6) +#define AVG_CELL_VOLT_POS_DEFAULT OSD_POS(1,3) +#define NUM_VARIO_POS_DEFAULT OSD_POS(1,7) // GPS OSD Positions #ifdef USE_GPS -#define GPS_SATS_POS OSD_POS(26,0) -#define GPS_HOME_DIR_POS OSD_POS(15,1) -#define GPS_HOME_DIST_POS OSD_POS(1,9) -#define GPS_SPEED_POS OSD_POS(1,8) -#define GPS_LAT_POS OSD_POS(0,12) -#define GPS_LON_POS OSD_POS(0,13) +#define GPS_SATS_POS_DEFAULT OSD_POS(26,0) +#define GPS_HOME_DIR_POS_DEFAULT OSD_POS(15,1) +#define GPS_HOME_DIST_POS_DEFAULT OSD_POS(1,9) +#define GPS_SPEED_POS_DEFAULT OSD_POS(1,8) +#define GPS_LAT_POS_DEFAULT OSD_POS(0,12) +#define GPS_LON_POS_DEFAULT OSD_POS(0,13) #else -#define GPS_SATS_POS OSD_HIDDEN -#define GPS_HOME_DIR_POS OSD_HIDDEN -#define GPS_HOME_DIST_POS OSD_HIDDEN -#define GPS_SPEED_POS OSD_HIDDEN -#define GPS_LAT_POS OSD_HIDDEN -#define GPS_LON_POS OSD_HIDDEN +#define GPS_SATS_POS_DEFAULT OSD_HIDDEN +#define GPS_HOME_DIR_POS_DEFAULT OSD_HIDDEN +#define GPS_HOME_DIST_POS_DEFAULT OSD_HIDDEN +#define GPS_SPEED_POS_DEFAULT OSD_HIDDEN +#define GPS_LAT_POS_DEFAULT OSD_HIDDEN +#define GPS_LON_POS_DEFAULT OSD_HIDDEN #endif extern char CRAFT_NAME[15]; // Do not make larger than 14 characters extern bool USE_IMPERIAL_UNITS; // Set to false to see units in Metric extern bool USE_PWM_ARM; // pin D5 ESP8266 -- If commented out arming will occure with altitude change +extern float BOARD_VCC; +extern uint16_t OSD_GPS_SATS_POS; extern struct msp_osd_config_t msp_osd_config; @@ -150,7 +152,8 @@ enum configType_e { CONFIG_VALUE_UINT16, CONFIG_VALUE_UINT8, CONFIG_VALUE_BOOL, - CONFIG_VALUE_STRING + CONFIG_VALUE_STRING, + CONFIG_VALUE_FLOAT }; struct configValue_t { @@ -160,7 +163,7 @@ struct configValue_t { uint32_t optionalData; }; -#define CONFIG_VALUE_COUNT 3 +#define CONFIG_VALUE_COUNT 15 extern const configValue_t configValues[CONFIG_VALUE_COUNT]; // config.cpp functions diff --git a/QLiteOSD/src/config_values.cpp b/QLiteOSD/src/config_values.cpp index 9583d5e..45b853a 100644 --- a/QLiteOSD/src/config_values.cpp +++ b/QLiteOSD/src/config_values.cpp @@ -7,7 +7,21 @@ const configValue_t configValues[CONFIG_VALUE_COUNT] = { {"CRAFT_NAME",&CRAFT_NAME,CONFIG_VALUE_STRING,14}, // 14 character limit {"USE_IMPERIAL_UNITS",&USE_IMPERIAL_UNITS,CONFIG_VALUE_BOOL}, - {"USE_PWM_ARM",&USE_PWM_ARM,CONFIG_VALUE_BOOL} + {"USE_PWM_ARM",&USE_PWM_ARM,CONFIG_VALUE_BOOL}, + + {"BOARD_VCC", &BOARD_VCC, CONFIG_VALUE_FLOAT}, + + {"OSD_ALTITUDE_POS", &msp_osd_config.osd_altitude_pos, CONFIG_VALUE_UINT16}, + {"OSD_AVG_CELL_VOLTAGE_POS", &msp_osd_config.osd_avg_cell_voltage_pos, CONFIG_VALUE_UINT16}, + {"OSD_MAIN_BATT_VOLTAGE_POS", &msp_osd_config.osd_main_batt_voltage_pos, CONFIG_VALUE_UINT16}, + {"OSD_CRAFTNAME_POS", &msp_osd_config.osd_craft_name_pos, CONFIG_VALUE_UINT16}, + {"OSD_GPS_SATS_POS", &OSD_GPS_SATS_POS, CONFIG_VALUE_UINT16}, + {"OSD_HOME_DIR_POS", &msp_osd_config.osd_home_dir_pos, CONFIG_VALUE_UINT16}, + {"OSD_HOME_DIST_POS", &msp_osd_config.osd_home_dist_pos, CONFIG_VALUE_UINT16}, + {"OSD_GPS_SPEED_POS", &msp_osd_config.osd_gps_speed_pos, CONFIG_VALUE_UINT16}, + {"OSD_GPS_LAT_POS", &msp_osd_config.osd_gps_lat_pos, CONFIG_VALUE_UINT16}, + {"OSD_GPS_LON_POS", &msp_osd_config.osd_gps_lon_pos, CONFIG_VALUE_UINT16}, + {"OSD_CROSSHAIRS_POS", &msp_osd_config.osd_crosshairs_pos, CONFIG_VALUE_UINT16} }; char CRAFT_NAME[15] = CRAFT_NAME_DEFAULT; // Do not make larger than 14 characters @@ -16,6 +30,10 @@ bool USE_IMPERIAL_UNITS = USE_IMPERIAL_UNITS_DEFAULT; // Set to false to see un bool USE_PWM_ARM = USE_PWM_ARM_DEFAULT; +float BOARD_VCC = BOARD_VCC_DEFAULT; + +uint16_t OSD_GPS_SATS_POS = GPS_SATS_POS_DEFAULT; + /** * Default values for the OSD Values are given here, some OSD elements * here may not be implemented, so using the web interface for config is reccomended. @@ -30,39 +48,39 @@ msp_osd_config_t msp_osd_config = { 56, // osd_item_count 0, // alt_alarm OSD_HIDDEN, // osd_rssi_value_pos - MAIN_BATT_VOLT_POS, // osd_main_batt_voltage_pos - CROSSHAIRS_POS, // osd_crosshairs_pos + MAIN_BATT_VOLT_POS_DEFAULT, // osd_main_batt_voltage_pos + CROSSHAIRS_POS_DEFAULT, // osd_crosshairs_pos OSD_HIDDEN, // osd_artificial_horizon_pos OSD_HIDDEN, // osd_horizon_sidebars_pos OSD_HIDDEN, // osd_item_timer_1_pos OSD_HIDDEN, // osd_item_timer_2_pos OSD_HIDDEN, // osd_flymode_pos - CRAFTNAME_POS, // osd_craft_name_pos + CRAFTNAME_POS_DEFAULT, // osd_craft_name_pos OSD_HIDDEN, // osd_throttle_pos_pos OSD_HIDDEN, // osd_vtx_channel_pos OSD_HIDDEN, // osd_current_draw_pos OSD_HIDDEN, // osd_mah_drawn_pos - GPS_SPEED_POS, // osd_gps_speed_pos - GPS_SATS_POS, // osd_gps_sats_pos - ALTITUDE_POS, // osd_altitude_pos + GPS_SPEED_POS_DEFAULT, // osd_gps_speed_pos + GPS_SATS_POS_DEFAULT, // osd_gps_sats_pos + ALTITUDE_POS_DEFAULT, // osd_altitude_pos OSD_HIDDEN, // osd_roll_pids_pos OSD_HIDDEN, // osd_pitch_pids_pos OSD_HIDDEN, // osd_yaw_pids_pos OSD_HIDDEN, // osd_power_pos OSD_HIDDEN, // osd_pidrate_profile_pos OSD_HIDDEN, // osd_warnings_pos - AVG_CELL_VOLT_POS, // osd_avg_cell_voltage_pos - GPS_LON_POS, // osd_gps_lon_pos - GPS_LAT_POS, // osd_gps_lat_pos + AVG_CELL_VOLT_POS_DEFAULT, // osd_avg_cell_voltage_pos + GPS_LON_POS_DEFAULT, // osd_gps_lon_pos + GPS_LAT_POS_DEFAULT, // osd_gps_lat_pos OSD_HIDDEN, // osd_debug_pos OSD_HIDDEN, // osd_pitch_angle_pos OSD_HIDDEN, // osd_roll_angle_pos OSD_HIDDEN, // osd_main_batt_usage_pos OSD_HIDDEN, // osd_disarmed_pos - GPS_HOME_DIR_POS, // osd_home_dir_pos - GPS_HOME_DIST_POS, // osd_home_dist_pos + GPS_HOME_DIR_POS_DEFAULT, // osd_home_dir_pos + GPS_HOME_DIST_POS_DEFAULT, // osd_home_dist_pos OSD_HIDDEN, // osd_numerical_heading_pos - NUM_VARIO_POS, // osd_numerical_vario_pos + NUM_VARIO_POS_DEFAULT, // osd_numerical_vario_pos OSD_HIDDEN, // osd_compass_bar_pos OSD_HIDDEN, // osd_esc_tmp_pos OSD_HIDDEN, // osd_esc_rpm_pos diff --git a/QLiteOSD/src/craft.cpp b/QLiteOSD/src/craft.cpp index a024e54..07c4d47 100644 --- a/QLiteOSD/src/craft.cpp +++ b/QLiteOSD/src/craft.cpp @@ -88,7 +88,7 @@ void CraftState::readVoltage() { void CraftState::sampleVoltage() { int readValue = analogRead(ANALOG_PIN); - voltageSamples += (readValue * (arduinoVCC / 1024.0f)) * (1.0f + (ValueR2 / ValueR1)); + voltageSamples += (readValue * (BOARD_VCC / 1024.0f)) * (1.0f + (ValueR2 / ValueR1)); sampleVoltageCount++; } diff --git a/QLiteOSD/src/web_interface.cpp b/QLiteOSD/src/web_interface.cpp index f744bb0..a6b8af7 100644 --- a/QLiteOSD/src/web_interface.cpp +++ b/QLiteOSD/src/web_interface.cpp @@ -50,17 +50,17 @@ void webInterfaceSendHeader() { webserver.sendHeader("Cache-Control", "no-cache, no-store"); webserver.sendHeader("Pragma", "no-cache"); webserver.sendHeader("Expires", "-1"); - webserver.chunkedResponseModeStart(200,"text/html"); -// webserver.setContentLength(CONTENT_LENGTH_UNKNOWN); -// webserver.send(200, "text/html", ""); - webserver.sendContent(FPSTR(HEAD_TITLE)); - webserver.sendContent(FPSTR(BODY_MENU)); +// webserver.chunkedResponseModeStart(200,"text/html"); + webserver.setContentLength(CONTENT_LENGTH_UNKNOWN); + webserver.send(200, "text/html", ""); + webserver.sendContent_P(HEAD_TITLE); + webserver.sendContent_P(BODY_MENU); } void webInterfaceSendFooter() { - webserver.sendContent(FPSTR(BODY_END)); -// webserver.sendContent(""); - webserver.chunkedResponseFinalize(); + webserver.sendContent_P(BODY_END); + webserver.sendContent(""); +// webserver.chunkedResponseFinalize(); webserver.client().stop(); } @@ -107,7 +107,7 @@ void webInterfaceHome() { webserver.sendContent(""); - webserver.sendContent(FPSTR(LOGFILES_JAVASCRIPT)); + webserver.sendContent_P(LOGFILES_JAVASCRIPT); #endif @@ -122,14 +122,14 @@ void webInterfaceHome() { webInterfaceSendFooter(); } -void webInterfaceConfigure() { - webInterfaceSendHeader(); - - String form = FPSTR(CONFIG_FORM); - +static void replaceFormConfig(String& form) { for (int i = 0; i < CONFIG_VALUE_COUNT; i++) { String replacementKey = String("%")+configValues[i].key+"%"; + // if (form.indexOf(replacementKey) == -1) { + // continue; + // } + switch (configValues[i].type) { case CONFIG_VALUE_STRING: form.replace(replacementKey,String((char*)configValues[i].globalValue)); @@ -143,10 +143,43 @@ void webInterfaceConfigure() { case CONFIG_VALUE_UINT8: form.replace(replacementKey,String(*(uint8_t*)configValues[i].globalValue)); break; + case CONFIG_VALUE_FLOAT: + form.replace(replacementKey,String(*(float*)configValues[i].globalValue)); + break; } } +} - webserver.sendContent(form); +void webInterfaceConfigure() { + webInterfaceSendHeader(); + + { + String form = FPSTR(CONFIG_FORM); + replaceFormConfig(form); + webserver.sendContent(form); + } + + { + String form = FPSTR(CONFIG_FORM_OSD); + replaceFormConfig(form); + webserver.sendContent(form); + } + + { + String form = FPSTR(CONFIG_FORM_OSD_2); + replaceFormConfig(form); + webserver.sendContent(form); + } + + { + String formJs = FPSTR(CONFIG_JAVASCRIPT); + formJs.replace("%READVALUE%",String(analogRead(ANALOG_PIN))); + formJs.replace("%VALUER1%",String(ValueR1)); + formJs.replace("%VALUER2%",String(ValueR2)); + webserver.sendContent(formJs); + } + + webserver.sendContent_P(CONFIG_OSD); webInterfaceSendFooter(); } @@ -175,6 +208,9 @@ void webInterfaceConfigSave() { case CONFIG_VALUE_UINT8: *(uint8_t*)configValues[i].globalValue = (uint8_t)argValue.toInt(); break; + case CONFIG_VALUE_FLOAT: + *(float*)configValues[i].globalValue = argValue.toFloat(); + break; } } diff --git a/QLiteOSD/src/web_interface.h b/QLiteOSD/src/web_interface.h index 7849ed8..e1e582a 100644 --- a/QLiteOSD/src/web_interface.h +++ b/QLiteOSD/src/web_interface.h @@ -50,6 +50,10 @@ extern const char* HEAD_TITLE PROGMEM; extern const char* BODY_MENU PROGMEM; extern const char* BODY_END PROGMEM; extern const char* CONFIG_FORM PROGMEM; +extern const char* CONFIG_FORM_OSD PROGMEM; +extern const char* CONFIG_FORM_OSD_2 PROGMEM; +extern const char* CONFIG_JAVASCRIPT PROGMEM; +extern const char* CONFIG_OSD PROGMEM; extern const char* LOGFILES_JAVASCRIPT PROGMEM; #endif diff --git a/QLiteOSD/src/web_interface_html.cpp b/QLiteOSD/src/web_interface_html.cpp index b6b70f1..451ad62 100644 --- a/QLiteOSD/src/web_interface_html.cpp +++ b/QLiteOSD/src/web_interface_html.cpp @@ -94,8 +94,49 @@ const char* HEAD_TITLE PROGMEM = "" - " "; + " \r\n"; const char* BODY_MENU PROGMEM = "" "
" @@ -114,9 +155,9 @@ const char* BODY_MENU PROGMEM = "" "
  • Reset
    • " " " " " - "

    "; + "

    \r\n"; -const char* BODY_END PROGMEM = "


    QLiteOSD v" VERSION "

    " +const char* BODY_END PROGMEM = "


    QLiteOSD v" VERSION "
    " " " - ""; + "\r\n"; const char* CONFIG_FORM PROGMEM = "

    Configuration:

    " "

    " "

    " "

    " - "
    "; + // Voltage + "

    " + "

    " + "

    " + "

    " + + "
    " + + // Save + "\r\n" + ; + +const char* CONFIG_FORM_OSD PROGMEM = // OSD Config + "

    OSD Layout

    " + "
    " + "

    Select an OSD Item

    " + "
    " + " " + " " + " " + "
    " + "
    " + " " + " " + " " + "
    " + "
    " + " " + " " + " " + "
    " + "
    " + " " + " " + " " + "
    " + "
    " + " " + " " + " " + "
    "; + +const char* CONFIG_FORM_OSD_2 PROGMEM = "
    " + " " + " " + " " + "
    " + "
    " + " " + " " + " " + "
    " + "
    " + " " + " " + " " + "
    " + "
    " + " " + " " + " " + "
    " + "
    " + " " + " " + " " + "
    " + "
    " + " " + " " + " " + "
    "; + +const char* CONFIG_JAVASCRIPT PROGMEM = "\r\n"; + +const char* CONFIG_OSD PROGMEM = + "

    Select OSD Item Locations

    " + " " + " " + " " + " " + "
    234
    " + " * 234 will hide the OSD element." + "
    " + " " + "" + " " + "
    " + "\r\n"; const char* LOGFILES_JAVASCRIPT PROGMEM = ""; + "\r\n"; #endif From 6995455004180d83c9a8e81aeb15bcc1ebc24ba4 Mon Sep 17 00:00:00 2001 From: jdflyer Date: Thu, 18 Jul 2024 13:20:15 -0700 Subject: [PATCH 3/7] Add DJI RX pin --- QLiteOSD/QLiteOSD.ino | 18 ++++++++++++++++++ QLiteOSD/src/config.h | 20 +++++++++++++++++--- QLiteOSD/src/web_interface_html.cpp | 4 ++-- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/QLiteOSD/QLiteOSD.ino b/QLiteOSD/QLiteOSD.ino index f875c33..626d118 100644 --- a/QLiteOSD/QLiteOSD.ino +++ b/QLiteOSD/QLiteOSD.ino @@ -131,9 +131,27 @@ void tick() { #ifdef DEBUG if (!gpsLogging) mspOsd.debugPrint(); +#else + +#ifdef USE_DJI_RX_PIN + static bool mspStarted = false; + + if (mspStarted) { + mspOsd.sendCraftMSP(); + }else { + if (mspOsd.msp.activityDetected()) { + mspStarted = true; + debugLog("****************** Found DJI MSP Activity ******************"); + }else { + debugLog("*** Waiting for MSP Activity from DJI Unit ***"); + } + } + #else mspOsd.sendCraftMSP(); #endif + +#endif } void loop() { diff --git a/QLiteOSD/src/config.h b/QLiteOSD/src/config.h index 7bb9bb9..b73d49e 100644 --- a/QLiteOSD/src/config.h +++ b/QLiteOSD/src/config.h @@ -29,6 +29,9 @@ #define ESP8266_TARGET // Uncommment this line if using the ESP8266 (Wemos D1 Mini) #define USE_GPS //comment out to disable. Reads and displays GPS data - requires Nano 328 due to file size +#define BOARD_VERSION 11 +// #define BOARD_VERSION 20 + #if defined(ESP8266_TARGET) #define WEB_INTERFACE // uncomment to disable the web interface #endif @@ -36,7 +39,7 @@ #if defined(WEB_INTERFACE) && defined(USE_GPS) // do not remove or comment this line out #define LOG_GPS //uncomment to log position and altitude data to the internal filesystem (requires a pushbutton to be added to switch to wifi mode) #endif -#define DEBUG // uncomment this line to debug in Serial Monitor +// #define DEBUG // uncomment this line to debug in Serial Monitor // Hardcoded config #define VERSION "2.0" @@ -66,11 +69,22 @@ #define PWM_TRIGGER_VALUE 1700 +#if BOARD_VERSION >= 20 +#define USE_DJI_RX_PIN true +#endif + #ifdef ESP8266_TARGET #define BOARD_VCC_DEFAULT 3.25f //Measured ESP8266 3.3 pin voltage #define PWM_ARM_PIN D5 -#define gps_RX_pin D8 // swapped in 1.2 to match board -#define gps_TX_pin D7 // swapped in 1.2 to match board + +#if BOARD_VERSION < 20 +#define gps_RX_pin D8 +#define gps_TX_pin D7 +#elif BOARD_VERSION >= 20 +#define gps_RX_pin D7 +#define gps_TX_pin D8 +#endif + #else #define BOARD_VCC_DEFAULT 4.95f //Measured Arduino 5V pin voltage #define PWM_ARM_PIN 10 diff --git a/QLiteOSD/src/web_interface_html.cpp b/QLiteOSD/src/web_interface_html.cpp index 451ad62..8200c31 100644 --- a/QLiteOSD/src/web_interface_html.cpp +++ b/QLiteOSD/src/web_interface_html.cpp @@ -151,8 +151,8 @@ const char* BODY_MENU PROGMEM = "" " " " " "
    \r\n"; From b53599cc42c81b82a9602da7ad34644f25d0f11a Mon Sep 17 00:00:00 2001 From: jdflyer Date: Thu, 18 Jul 2024 14:46:29 -0700 Subject: [PATCH 4/7] Add LED Support --- QLiteOSD/QLiteOSD.ino | 95 ++++++++++++++++++++--------- QLiteOSD/src/config.h | 35 ++++++++++- QLiteOSD/src/config_values.cpp | 17 ++++++ QLiteOSD/src/gpsLog.cpp | 4 +- QLiteOSD/src/led.cpp | 94 ++++++++++++++++++++++++++++ QLiteOSD/src/led.h | 13 ++++ QLiteOSD/src/web_interface.cpp | 22 +++++++ QLiteOSD/src/web_interface.h | 7 +++ QLiteOSD/src/web_interface_html.cpp | 76 ++++++++++++++++++++++- 9 files changed, 326 insertions(+), 37 deletions(-) create mode 100644 QLiteOSD/src/led.cpp create mode 100644 QLiteOSD/src/led.h diff --git a/QLiteOSD/QLiteOSD.ino b/QLiteOSD/QLiteOSD.ino index 626d118..ef9d63f 100644 --- a/QLiteOSD/QLiteOSD.ino +++ b/QLiteOSD/QLiteOSD.ino @@ -1,16 +1,16 @@ /* * QLiteOSD is an simple OSD for DJI FPV System: * This is an Arduino project that handles basic OSD functions - * from BMP280 to a Simple Voltage Sensor to feed it + * from BMP280 to a Simple Voltage Sensor to feed it * to DJI FPV System. * * ------------------------------------------------ * * Copyright (C) 2023 David Payne - * + * * This software is based on and uses software published by Paul Kurucz (pkuruz):opentelem_to_bst_bridge * as well as software d3ngit : djihdfpv_mavlink_to_msp_V2 and crashsalot : VOT_to_DJIFPV - * + * * License info: See the LICENSE file at the repo top level * * THIS SOFTWARE IS PROVIDED IN AN "AS IS" CONDITION. NO WARRANTIES, @@ -22,7 +22,7 @@ * */ -/* +/* * QLiteOSD * * Arduino Nano TX1 to DJI Air unit RX(115200) @@ -31,7 +31,6 @@ * GPS addition by GravelAxe -- uses D7-RX and D8-TX */ - /* ----------------------------------------------------- */ #include "src/libraries/MSP.h" @@ -43,9 +42,11 @@ #include "src/filesystem.h" #include "src/web_interface.h" #include "src/gpsLog.h" +#include "src/led.h" /* ----------------------------------------------------- */ -void setup() { +void setup() +{ Serial.begin(115200); #ifdef WEB_INTERFACE @@ -61,14 +62,19 @@ void setup() { craftState.init(); mspOsd.init(); - + +#ifdef USE_LEDS + ledInit(); // todo: see if this needs to go before GPS init +#endif + pinMode(LED_BUILTIN, OUTPUT); - + debugLog("Starting!"); } // Ran once every TICK_INTERVAL msecs -void tick() { +void tick() +{ static uint32_t flight_ticks = 0; static bool lightOn = false; @@ -78,36 +84,46 @@ void tick() { // 30 tick wait for enabling the web interface static uint32_t webInterfaceEnableTicks = 0; - if (digitalRead(WEB_INTERFACE_BUTTON_PIN) == LOW) { + if (digitalRead(WEB_INTERFACE_BUTTON_PIN) == LOW) + { webInterfaceEnableTicks++; - if (webInterfaceEnableTicks >= WEB_INTERFACE_ENABLE_TICKS) { + if (webInterfaceEnableTicks >= WEB_INTERFACE_ENABLE_TICKS) + { webInterfaceInit(); return; } - }else { + } + else + { webInterfaceEnableTicks = 0; } #endif craftState.readVoltage(); - if (flight_ticks % ALTITUDE_UPDATE_INTERVAL == 0) { + if (flight_ticks % ALTITUDE_UPDATE_INTERVAL == 0) + { craftState.readAltitude(); } - if (flight_ticks % LIGHT_UPDATE_INTERVAL == 0) { + if (flight_ticks % LIGHT_UPDATE_INTERVAL == 0) + { digitalWrite(LED_BUILTIN, lightOn ? LOW : HIGH); lightOn = !lightOn; } #ifdef USE_GPS craftState.readGPS(); - if (flight_ticks % GPS_SATELITE_BLINK_UPDATE_INTERVAL == 0) { - if (!craftState.gpsHomeSet) { + if (flight_ticks % GPS_SATELITE_BLINK_UPDATE_INTERVAL == 0) + { + if (!craftState.gpsHomeSet) + { static bool satsOn = false; msp_osd_config.osd_gps_sats_pos = satsOn ? OSD_GPS_SATS_POS : OSD_HIDDEN; satsOn = !satsOn; - }else { + } + else + { msp_osd_config.osd_gps_sats_pos = OSD_GPS_SATS_POS; } } @@ -117,16 +133,26 @@ void tick() { #ifdef LOG_GPS // Once the flight is armed and home is set, GPS is accurate enough to start logging - if (!gpsLogging && craftState.flightModeFlags == FLIGHT_ARMED && craftState.gpsHomeSet) { + if (!gpsLogging && craftState.flightModeFlags == FLIGHT_ARMED && craftState.gpsHomeSet) + { gpsLogInit(); } // End the gps log if the flight gets unarmed - if (gpsLogging && craftState.flightModeFlags == FLIGHT_UNARMED) { + if (gpsLogging && craftState.flightModeFlags == FLIGHT_UNARMED) + { gpsLogEnd(); } #endif +#ifdef USE_LEDS + String ledMode = RGB_MODE; + if ((ledMode != "OFF" && ledMode != "ON") && flight_ticks % LED_UPDATE_INTERVAL == 0) { + ledUpdate(); + } +#endif + + // SEND the data out #ifdef DEBUG if (!gpsLogging) @@ -136,13 +162,19 @@ void tick() { #ifdef USE_DJI_RX_PIN static bool mspStarted = false; - if (mspStarted) { + if (mspStarted) + { mspOsd.sendCraftMSP(); - }else { - if (mspOsd.msp.activityDetected()) { + } + else + { + if (mspOsd.msp.activityDetected()) + { mspStarted = true; debugLog("****************** Found DJI MSP Activity ******************"); - }else { + } + else + { debugLog("*** Waiting for MSP Activity from DJI Unit ***"); } } @@ -154,27 +186,30 @@ void tick() { #endif } -void loop() { +void loop() +{ #ifdef WEB_INTERFACE - if (webInterfaceOn) { + if (webInterfaceOn) + { webInterfaceLoop(); return; } #endif - + static uint32_t lastLoopTime = 0; - craftState.sample(); uint32_t currentLoopTime = millis(); - if (currentLoopTime - lastLoopTime >= TICK_INTERVAL) { - lastLoopTime = currentLoopTime/* + (currentLoopTime-lastLoopTime-TICK_INTERVAL) */; + if (currentLoopTime - lastLoopTime >= TICK_INTERVAL) + { + lastLoopTime = currentLoopTime /* + (currentLoopTime-lastLoopTime-TICK_INTERVAL) */; tick(); } #ifdef LOG_GPS - if (gpsLogging) { + if (gpsLogging) + { gpsLogLoop(); } #endif diff --git a/QLiteOSD/src/config.h b/QLiteOSD/src/config.h index b73d49e..d7a7290 100644 --- a/QLiteOSD/src/config.h +++ b/QLiteOSD/src/config.h @@ -28,6 +28,7 @@ #define ESP8266_TARGET // Uncommment this line if using the ESP8266 (Wemos D1 Mini) #define USE_GPS //comment out to disable. Reads and displays GPS data - requires Nano 328 due to file size +#define USE_LEDS // comment out to disable. Adds controls for an LED strip #define BOARD_VERSION 11 // #define BOARD_VERSION 20 @@ -85,11 +86,20 @@ #define gps_TX_pin D8 #endif +#ifdef USE_LEDS +#define LED_PIN D6 +#endif + #else #define BOARD_VCC_DEFAULT 4.95f //Measured Arduino 5V pin voltage #define PWM_ARM_PIN 10 #define gps_RX_pin 4 #define gps_TX_pin 3 + +#ifdef USE_LEDS +#define LED_PIN 11 +#endif + #endif #ifdef WEB_INTERFACE @@ -162,6 +172,28 @@ extern uint16_t OSD_GPS_SATS_POS; extern struct msp_osd_config_t msp_osd_config; +#ifdef USE_LEDS + +#define NUM_LEDS 12 +#define LED_UPDATE_INTERVAL 10 // in ticks + +#define RGB_MODE_DEFAULT "ON" + +#define RED_VALUE_DEFAULT 0 +#define GREEN_VALUE_DEFAULT 255 +#define BLUE_VALUE_DEFAULT 0 + +extern char RGB_MODE[16]; +extern uint8_t RED_VALUE; +extern uint8_t GREEN_VALUE; +extern uint8_t BLUE_VALUE; + +#define LED_CONFIG_NUM 4 + +#else +#define LED_CONFIG_NUM 0 +#endif + enum configType_e { CONFIG_VALUE_UINT16, CONFIG_VALUE_UINT8, @@ -177,7 +209,8 @@ struct configValue_t { uint32_t optionalData; }; -#define CONFIG_VALUE_COUNT 15 +#define CONFIG_VALUE_COUNT (15 + LED_CONFIG_NUM) + extern const configValue_t configValues[CONFIG_VALUE_COUNT]; // config.cpp functions diff --git a/QLiteOSD/src/config_values.cpp b/QLiteOSD/src/config_values.cpp index 45b853a..7577850 100644 --- a/QLiteOSD/src/config_values.cpp +++ b/QLiteOSD/src/config_values.cpp @@ -11,6 +11,13 @@ const configValue_t configValues[CONFIG_VALUE_COUNT] = { {"BOARD_VCC", &BOARD_VCC, CONFIG_VALUE_FLOAT}, +#ifdef USE_LEDS + {"RGB_MODE", &RGB_MODE, CONFIG_VALUE_STRING, 16}, + {"RED_VALUE", &RED_VALUE, CONFIG_VALUE_UINT8}, + {"GREEN_VALUE", &GREEN_VALUE, CONFIG_VALUE_UINT8}, + {"BLUE_VALUE", &BLUE_VALUE, CONFIG_VALUE_UINT8}, +#endif + {"OSD_ALTITUDE_POS", &msp_osd_config.osd_altitude_pos, CONFIG_VALUE_UINT16}, {"OSD_AVG_CELL_VOLTAGE_POS", &msp_osd_config.osd_avg_cell_voltage_pos, CONFIG_VALUE_UINT16}, {"OSD_MAIN_BATT_VOLTAGE_POS", &msp_osd_config.osd_main_batt_voltage_pos, CONFIG_VALUE_UINT16}, @@ -26,6 +33,16 @@ const configValue_t configValues[CONFIG_VALUE_COUNT] = { char CRAFT_NAME[15] = CRAFT_NAME_DEFAULT; // Do not make larger than 14 characters +#ifdef USE_LEDS + +char RGB_MODE[16] = RGB_MODE_DEFAULT; + +uint8_t RED_VALUE = RED_VALUE_DEFAULT; +uint8_t GREEN_VALUE = GREEN_VALUE_DEFAULT; +uint8_t BLUE_VALUE = BLUE_VALUE_DEFAULT; + +#endif + bool USE_IMPERIAL_UNITS = USE_IMPERIAL_UNITS_DEFAULT; // Set to false to see units in Metric bool USE_PWM_ARM = USE_PWM_ARM_DEFAULT; diff --git a/QLiteOSD/src/gpsLog.cpp b/QLiteOSD/src/gpsLog.cpp index 4000e21..1b4c484 100644 --- a/QLiteOSD/src/gpsLog.cpp +++ b/QLiteOSD/src/gpsLog.cpp @@ -5,9 +5,7 @@ #include "craft.h" #include "filesystem.h" -#ifdef DEBUG -#include "MSP_OSD.h" -#endif +#include "MSP_OSD.h" //Used for the debugLog def bool gpsLogging = false; diff --git a/QLiteOSD/src/led.cpp b/QLiteOSD/src/led.cpp new file mode 100644 index 0000000..8ea0727 --- /dev/null +++ b/QLiteOSD/src/led.cpp @@ -0,0 +1,94 @@ +#include "led.h" + +#ifdef USE_LEDS + +#include +#include "craft.h" + +Adafruit_NeoPixel pixels = Adafruit_NeoPixel(NUM_LEDS, LED_PIN, NEO_GRB + NEO_KHZ800); + +#ifdef WEB_INTERFACE +void ledWebserverColors() { + pixels.fill(pixels.Color(0, 0, 155), 0, NUM_LEDS); + pixels.show(); +} +#endif + +void ledInit() { + pixels.begin(); +} + +void ledUpdate() { + static bool flashOn = true; + + String ledMode = RGB_MODE; + flashOn = !flashOn; + + if (ledMode == "OFF") { + pixels.fill(pixels.Color(0, 0, 0), 0, NUM_LEDS); + } else if (ledMode == "ON") { + pixels.fill(pixels.Color(RED_VALUE,GREEN_VALUE,BLUE_VALUE), 0, NUM_LEDS); + } else if (ledMode == "BATTERY") { + float cellVoltage = craftState.voltage / craftState.getCellCount(); + uint8_t rVal; + uint8_t gVal; + + if (cellVoltage >= 4.2f) { + gVal = 255; + rVal = 0; + }else if(cellVoltage <= 3.6f) { + gVal = 0; + rVal = 255; + }else { + float percent = (cellVoltage-3.6f)/(4.2f-3.6f); + gVal = percent*255; + rVal = (1.0f-percent)*255; + } + + if (flashOn && cellVoltage <= 36) { + pixels.fill(pixels.Color(0, 0, 0), 0, NUM_LEDS); + } else { + pixels.fill(pixels.Color(rVal, gVal, 0), 0, NUM_LEDS); + } + } else if (ledMode == "ALTITUDE") { + float alt = craftState.getRelativeAltitude(); + uint8_t rVal; + uint8_t gVal; + + if (alt >= 121.92f) { // 400 ft + gVal = 0; + rVal = 255; + }else if(alt <= 0.0f) { + gVal = 255; + rVal = 0; + }else { + float percent = (alt)/(121.92f); + rVal = percent*255; + gVal = (1.0f-percent)*255; + } + + if (flashOn && alt >= 121.92f) { + pixels.fill(pixels.Color(0, 0, 0), 0, NUM_LEDS); + } else { + pixels.fill(pixels.Color(rVal, gVal, 0), 0, NUM_LEDS); + } + } else if (ledMode == "STROBE") { + if (flashOn) { + pixels.fill(pixels.Color(RED_VALUE, GREEN_VALUE, BLUE_VALUE), 0, NUM_LEDS); + } else { + pixels.fill(pixels.Color(0, 0, 0), 0, NUM_LEDS); + } + } else if (ledMode == "AIRCRAFT") { + pixels.fill(pixels.Color(0, 0, 0), 0, 24); + pixels.fill(pixels.Color(0, 255, 0), 0, 4); + pixels.fill(pixels.Color(255, 255, 255), 4, 4); + pixels.fill(pixels.Color(255, 0, 0), 8, 4); + if (!flashOn) { + pixels.fill(pixels.Color(0, 0, 0), 4, 4); + } + } + + pixels.show(); +} + +#endif diff --git a/QLiteOSD/src/led.h b/QLiteOSD/src/led.h new file mode 100644 index 0000000..fe14475 --- /dev/null +++ b/QLiteOSD/src/led.h @@ -0,0 +1,13 @@ +#pragma once +#include "config.h" + +#ifdef USE_LEDS + +void ledInit(); +void ledUpdate(); + +#ifdef WEB_INTERFACE +void ledWebserverColors(); +#endif + +#endif diff --git a/QLiteOSD/src/web_interface.cpp b/QLiteOSD/src/web_interface.cpp index a6b8af7..246d0bd 100644 --- a/QLiteOSD/src/web_interface.cpp +++ b/QLiteOSD/src/web_interface.cpp @@ -5,6 +5,7 @@ #include "craft.h" #include "filesystem.h" #include "gpsLog.h" +#include "led.h" #include #include @@ -40,6 +41,9 @@ void webInterfaceInit() { webserver.begin(); digitalWrite(LED_BUILTIN, LOW); +#ifdef USE_LEDS + ledWebserverColors(); +#endif } void webInterfaceLoop() { @@ -159,6 +163,22 @@ void webInterfaceConfigure() { webserver.sendContent(form); } +#ifdef USE_LEDS + { + String options = FPSTR(CONFIG_RGB_OPTIONS); + options.replace(">" + String(RGB_MODE) + "<", " selected>" + String(RGB_MODE) + "<"); + webserver.sendContent(options); + } + + { + String form = FPSTR(CONFIG_FORM_LED); + replaceFormConfig(form); + webserver.sendContent(form); + } + + webserver.sendContent_P(CONFIG_RGB_JS); +#endif + { String form = FPSTR(CONFIG_FORM_OSD); replaceFormConfig(form); @@ -171,6 +191,8 @@ void webInterfaceConfigure() { webserver.sendContent(form); } + webserver.sendContent_P(CONFIG_FORM_SAVE); + { String formJs = FPSTR(CONFIG_JAVASCRIPT); formJs.replace("%READVALUE%",String(analogRead(ANALOG_PIN))); diff --git a/QLiteOSD/src/web_interface.h b/QLiteOSD/src/web_interface.h index e1e582a..547dcad 100644 --- a/QLiteOSD/src/web_interface.h +++ b/QLiteOSD/src/web_interface.h @@ -50,10 +50,17 @@ extern const char* HEAD_TITLE PROGMEM; extern const char* BODY_MENU PROGMEM; extern const char* BODY_END PROGMEM; extern const char* CONFIG_FORM PROGMEM; +extern const char* CONFIG_FORM_SAVE PROGMEM; extern const char* CONFIG_FORM_OSD PROGMEM; extern const char* CONFIG_FORM_OSD_2 PROGMEM; extern const char* CONFIG_JAVASCRIPT PROGMEM; extern const char* CONFIG_OSD PROGMEM; extern const char* LOGFILES_JAVASCRIPT PROGMEM; +#ifdef USE_LEDS +extern const char* CONFIG_FORM_LED PROGMEM; +extern const char* CONFIG_RGB_OPTIONS PROGMEM; +extern const char* CONFIG_RGB_JS PROGMEM; +#endif + #endif diff --git a/QLiteOSD/src/web_interface_html.cpp b/QLiteOSD/src/web_interface_html.cpp index 8200c31..3644e4d 100644 --- a/QLiteOSD/src/web_interface_html.cpp +++ b/QLiteOSD/src/web_interface_html.cpp @@ -181,11 +181,81 @@ const char* CONFIG_FORM PROGMEM = "

    Configuration:

    " "
    " - - // Save - "
    \r\n" ; +const char* CONFIG_FORM_SAVE PROGMEM = "\r\n"; + +#ifdef USE_LEDS +const char* CONFIG_FORM_LED PROGMEM = + " (D6 pin)

    " + "
    " + "
    " + " " + " " + " " + "
    " + "
    " + " " + " " + " " + "
    " + "
    " + " " + " " + " " + "
    " + "
    " + "
    "; + +const char* CONFIG_RGB_OPTIONS PROGMEM = + "
    " + "