diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + 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/firmware/application/Makefile b/firmware/application/Makefile index 70e9d61..6282162 100644 --- a/firmware/application/Makefile +++ b/firmware/application/Makefile @@ -76,6 +76,7 @@ SRC_FILES += \ $(SDK_ROOT)/integration/nrfx/legacy/nrf_drv_spi.c \ $(SDK_ROOT)/integration/nrfx/legacy/nrf_drv_ppi.c \ $(SDK_ROOT)/modules/nrfx/soc/nrfx_atomic.c \ + $(SDK_ROOT)/modules/nrfx/drivers/src/nrfx_saadc.c \ $(SDK_ROOT)/modules/nrfx/drivers/src/nrfx_clock.c \ $(SDK_ROOT)/modules/nrfx/drivers/src/nrfx_gpiote.c \ $(SDK_ROOT)/modules/nrfx/drivers/src/nrfx_power.c \ @@ -101,6 +102,7 @@ SRC_FILES += \ $(SDK_ROOT)/components/ble/nrf_ble_gatt/nrf_ble_gatt.c \ $(SDK_ROOT)/external/utf_converter/utf.c \ $(SDK_ROOT)/components/ble/ble_services/ble_nus/ble_nus.c \ + $(SDK_ROOT)/components/ble/ble_services/ble_bas/ble_bas.c \ $(SDK_ROOT)/components/ble/nrf_ble_qwr/nrf_ble_qwr.c \ $(SDK_ROOT)/components/softdevice/common/nrf_sdh.c \ $(SDK_ROOT)/components/softdevice/common/nrf_sdh_ble.c \ @@ -169,6 +171,7 @@ INC_FOLDERS += \ $(SDK_ROOT)/components/libraries/csense_drv \ $(SDK_ROOT)/components/libraries/memobj \ $(SDK_ROOT)/components/ble/ble_services/ble_nus_c \ + $(SDK_ROOT)/components/ble/ble_services/ble_bas_c \ $(SDK_ROOT)/components/softdevice/common \ $(SDK_ROOT)/components/ble/ble_services/ble_ias \ $(SDK_ROOT)/components/libraries/usbd/class/hid/mouse \ diff --git a/firmware/application/application.ld b/firmware/application/application.ld index 1f55775..507a598 100644 --- a/firmware/application/application.ld +++ b/firmware/application/application.ld @@ -5,7 +5,7 @@ GROUP(-lgcc -lc -lnosys) MEMORY { - FLASH (rx) : ORIGIN = 0x27000, LENGTH = 0xf3000 + FLASH (rx) : ORIGIN = 0x27000, LENGTH = 0xCC000 RAM (rwx) : ORIGIN = 0x20002ae8, LENGTH = 0x35518 } diff --git a/firmware/application/src/app_main.c b/firmware/application/src/app_main.c index 85c27b4..2c4a529 100644 --- a/firmware/application/src/app_main.c +++ b/firmware/application/src/app_main.c @@ -15,6 +15,7 @@ #include "nrf_pwr_mgmt.h" #include "nrfx_nfct.h" #include "nrfx_power.h" +#include "nrf_drv_lpcomp.h" #define NRF_LOG_MODULE_NAME app_main #include "nrf_log.h" @@ -36,7 +37,6 @@ NRF_LOG_MODULE_REGISTER(); #include "rgb_marquee.h" - // Defining soft timers APP_TIMER_DEF(m_button_check_timer); // Timer for button debounce static bool m_is_read_btn_press = false; @@ -44,6 +44,12 @@ static bool m_is_write_btn_press = false; // cpu reset reason static uint32_t m_reset_source; +static uint32_t m_gpregret_val; + +#define GPREGRET_CLEAR_VALUE_DEFAULT (0xFFFFFFFFUL) +#define RESET_ON_LF_FIELD_EXISTS_Msk (1UL) + +extern bool g_is_low_battery_shutdown; /**@brief Function for assert macro callback. @@ -69,26 +75,6 @@ static void app_timers_init(void) { APP_ERROR_CHECK(err_code); } -/**@brief Function for putting the chip into sleep mode. - * - * @note This function will not return. - */ -static void sleep_mode_enter(void) { - ret_code_t err_code; - - // Go to system-off mode (this function will not return; wakeup will cause a reset). - // Note that if jlink is plugged in or debug is on, an error may be reported when entering a low-power function. - // When turning on debugging we should disable low power state value detection or simply not enter low power - err_code = sd_power_system_off(); - - // OK, this is very important, if the log output is enabled and RTT is enabled, then do not check for low power mode errors -#if !(NRF_LOG_ENABLED && NRF_LOG_BACKEND_RTT_ENABLED) - APP_ERROR_CHECK(err_code); -#else - UNUSED_VARIABLE(err_code); -#endif -} - /**@brief Function for initializing the nrf log module. */ static void log_init(void) { @@ -196,14 +182,17 @@ static void button_init(void) { /**@brief The implementation function to enter deep hibernation */ static void system_off_enter(void) { + ret_code_t ret; // Disable the HF NFC event first NRF_NFCT->INTENCLR = NRF_NFCT_DISABLE_ALL_INT; // Then disable the LF LPCOMP event NRF_LPCOMP->INTENCLR = LPCOMP_INTENCLR_CROSS_Msk | LPCOMP_INTENCLR_UP_Msk | LPCOMP_INTENCLR_DOWN_Msk | LPCOMP_INTENCLR_READY_Msk; + // Save tag data + tag_emulation_save(); + // Configure RAM hibernation hold - ret_code_t ret; uint32_t ram8_retention = // RAM8 Each section has 32KB capacity // POWER_RAM_POWER_S0RETENTION_On << POWER_RAM_POWER_S0RETENTION_Pos ; // POWER_RAM_POWER_S1RETENTION_On << POWER_RAM_POWER_S1RETENTION_Pos | @@ -214,28 +203,40 @@ static void system_off_enter(void) { ret = sd_power_ram_power_set(8, ram8_retention); APP_ERROR_CHECK(ret); - - // Power off animation - uint8_t slot = tag_emulation_get_slot(); - uint32_t* p_led_array = hw_get_led_array(); - for (uint8_t i = 0; i < RGB_LIST_NUM; i++) { - nrf_gpio_pin_clear(p_led_array[i]); - } - uint8_t dir = slot > 3 ? 1 : 0; - uint8_t color = get_color_by_slot(slot); - if (m_reset_source & (NRF_POWER_RESETREAS_NFC_MASK | NRF_POWER_RESETREAS_LPCOMP_MASK)) { - if (m_reset_source & NRF_POWER_RESETREAS_NFC_MASK) { - color = 1; - } else { - color = 2; + if (g_is_low_battery_shutdown) { + // Don't create too complex animations, just blink LED1 three times. + rgb_marquee_stop(); + set_slot_light_color(0); + for (uint8_t i = 0; i <= 3; i++) { + nrf_gpio_pin_set(LED_1); + bsp_delay_ms(100); + nrf_gpio_pin_clear(LED_1); + bsp_delay_ms(100); } + } else { + // close all led. + uint32_t* p_led_array = hw_get_led_array(); + for (uint8_t i = 0; i < RGB_LIST_NUM; i++) { + nrf_gpio_pin_clear(p_led_array[i]); + } + uint8_t slot = tag_emulation_get_slot(); + // Power off animation + uint8_t dir = slot > 3 ? 1 : 0; + uint8_t color = get_color_by_slot(slot); + if (m_reset_source & (NRF_POWER_RESETREAS_NFC_MASK | NRF_POWER_RESETREAS_LPCOMP_MASK)) { + if (m_reset_source & NRF_POWER_RESETREAS_NFC_MASK) { + color = 1; + } else { + color = 2; + } + } + ledblink5(color, slot, dir ? 7 : 0); + ledblink4(color, dir, 7, 99, 75); + ledblink4(color, !dir, 7, 75, 50); + ledblink4(color, dir, 7, 50, 25); + ledblink4(color, !dir, 7, 25, 0); + rgb_marquee_stop(); } - ledblink5(color, slot, dir ? 7 : 0); - ledblink4(color, dir, 7, 99, 75); - ledblink4(color, !dir, 7, 75, 50); - ledblink4(color, dir, 7, 50, 25); - ledblink4(color, !dir, 7, 25, 0); - // IOs that need to be configured as floating analog inputs ==> no pull-up or pull-down uint32_t gpio_cfg_default_nopull[] = { @@ -246,7 +247,7 @@ static void system_off_enter(void) { HF_SPI_MOSI, LF_OA_OUT, #endif - BAT_SENSE, + BAT_SENSE_PIN, }; for (int i = 0; i < ARRAY_SIZE(gpio_cfg_default_nopull); i++) { nrf_gpio_cfg_default(gpio_cfg_default_nopull[i]); @@ -257,6 +258,7 @@ static void system_off_enter(void) { #if defined(PROJECT_CHAMELEON_ULTRA) HF_ANT_SEL, #endif + LED_FIELD, LED_R, LED_G, LED_B, }; for (int i = 0; i < ARRAY_SIZE(gpio_cfg_output_high); i++) { nrf_gpio_cfg_output(gpio_cfg_output_high[i]); @@ -265,7 +267,7 @@ static void system_off_enter(void) { // IOs that need to be configured as push-pull outputs and pulled low uint32_t gpio_cfg_output_low[] = { - LED_1, LED_2, LED_3, LED_4, LED_5, LED_6, LED_7, LED_8, LED_R, LED_G, LED_B, LF_MOD, + LED_1, LED_2, LED_3, LED_4, LED_5, LED_6, LED_7, LED_8, LF_MOD, #if defined(PROJECT_CHAMELEON_ULTRA) READER_POWER, LF_ANT_DRIVER #endif @@ -278,15 +280,34 @@ static void system_off_enter(void) { // Wait for a while before hibernating to avoid GPIO circuit configuration fluctuations to wake up the chip bsp_delay_ms(50); - // Then save the card slot configuration and other data - tag_emulation_save(); - - // Then hibernate + // Print leaving message finally NRF_LOG_INFO("Sleep finally, Bye ^.^"); // Turn off all soft timers app_timer_stop_all(); - // Calling system hibernation - sleep_mode_enter(); + + // 检查是否存在低频场，解决休眠时有非常强的场信号一直使比较器处于高电平输入状态从而无法产生上升沿而无法唤醒系统的问题。 + if(lf_is_field_exists()) { + // 关闭比较器 + nrf_drv_lpcomp_disable(); + // 设置reset原因，重启后需要拿到此原因，避免误判唤醒源 + sd_power_gpregret_clr(1, GPREGRET_CLEAR_VALUE_DEFAULT); + sd_power_gpregret_set(1, RESET_ON_LF_FIELD_EXISTS_Msk); + // 触发reset唤醒系统，重新启动模拟过程 + nrf_pwr_mgmt_shutdown(NRF_PWR_MGMT_SHUTDOWN_RESET); + return; + }; + + // Go to system-off mode (this function will not return; wakeup will cause a reset). + // 注意，如果插着jlink或者开着debug，进入低功耗的函数可能会报错， + // 开启调试时我们应当禁用低功耗状态值检测，或者干脆不进入低功耗 + ret = sd_power_system_off(); + + // OK，此处非常重要，如果开启了日志输出并且使能了RTT，则不去检查低功耗模式的错误 +#if !(NRF_LOG_ENABLED && NRF_LOG_BACKEND_RTT_ENABLED) + APP_ERROR_CHECK(ret); +#else + UNUSED_VARIABLE(ret); +#endif // It is not supposed to enter here, but jlink debug mode it can be entered, at most is not normal hibernation just // jlink connection, power consumption will rise, and hibernation will also be stuck in this step. @@ -301,6 +322,10 @@ static void check_wakeup_src(void) { sd_power_reset_reason_get(&m_reset_source); sd_power_reset_reason_clr(m_reset_source); + sd_power_gpregret_get(1, &m_gpregret_val); + sd_power_gpregret_clr(1, GPREGRET_CLEAR_VALUE_DEFAULT); + + /* * Note: The hibernation described below is deep hibernation, stopping any non-wakeup source peripherals and stopping the CPU to achieve the lowest power consumption * @@ -329,7 +354,8 @@ static void check_wakeup_src(void) { // If no operation follows, wait for the timeout and then deep hibernate sleep_timer_start(SLEEP_DELAY_MS_BUTTON_WAKEUP); - } else if (m_reset_source & (NRF_POWER_RESETREAS_NFC_MASK | NRF_POWER_RESETREAS_LPCOMP_MASK)) { + } else if ((m_reset_source & (NRF_POWER_RESETREAS_NFC_MASK | NRF_POWER_RESETREAS_LPCOMP_MASK)) || + (m_gpregret_val & RESET_ON_LF_FIELD_EXISTS_Msk)) { NRF_LOG_INFO("WakeUp from rfid field"); // wake up from hf field. @@ -338,8 +364,16 @@ static void check_wakeup_src(void) { NRF_LOG_INFO("WakeUp from HF"); } else { color = 2; // LF filed show B. - NRF_LOG_INFO("WakeUp from LF"); + if (m_gpregret_val & RESET_ON_LF_FIELD_EXISTS_Msk) { + NRF_LOG_INFO("Reset by LF"); + } else { + NRF_LOG_INFO("WakeUp from LF"); + } } + + // 当前是模拟卡事件唤醒系统，我们可以让场强灯先亮起来 + TAG_FIELD_LED_ON(); + // In the case of field wake-up, only one round of RGB is swept as the power-on animation ledblink2(color, !dir, dir ? slot : 7 - slot); set_slot_light_color(color); @@ -368,10 +402,15 @@ static void check_wakeup_src(void) { // Initialize the default card slot data. tag_emulation_factory_init(); + // RGB ledblink2(0, !dir, 11); ledblink2(1, dir, 11); ledblink2(2, !dir, 11); + // Show RGB for slot. + set_slot_light_color(color); + light_up_by_slot(); + // If the USB is plugged in when first powered up, we can do something accordingly if (nrfx_power_usbstatus_get() != NRFX_POWER_USB_STATE_DISCONNECTED) { NRF_LOG_INFO("USB Power found."); @@ -457,11 +496,12 @@ static void blink_usb_led_status(void) { } } - /**@brief Application main function. */ int main(void) { hw_connect_init(); // Remember to initialize the pins first + init_leds(); // LED initialization + log_init(); // Log initialization gpio_te_init(); // Initialize GPIO matrix library app_timers_init(); // Initialize soft timer @@ -469,7 +509,6 @@ int main(void) { bsp_timer_init(); // Initialize timeout timer bsp_timer_start(); // Start BSP TIMER and prepare it for processing business logic button_init(); // Button initialization for handling business logic - init_leds(); // LED initialization sleep_timer_init(); // Soft timer initialization for hibernation rng_drv_and_srand_init(); // Random number generator initialization power_management_init(); // Power management initialization diff --git a/firmware/application/src/ble_main.c b/firmware/application/src/ble_main.c index 6e676b6..424716b 100644 --- a/firmware/application/src/ble_main.c +++ b/firmware/application/src/ble_main.c @@ -1,5 +1,4 @@ #include "ble_hci.h" -#include "ble_nus.h" #include "ble_advdata.h" #include "ble_advertising.h" #include "ble_conn_params.h" @@ -11,6 +10,7 @@ #include "nrf_sdh_soc.h" #include "nrf_sdh_ble.h" #include "nrf_ble_gatt.h" +#include "nrf_drv_saadc.h" #include "app_timer.h" #include "app_util_platform.h" @@ -18,6 +18,7 @@ #include "syssleep.h" #include "ble_main.h" #include "dataframe.h" +#include "hw_connect.h" #define NRF_LOG_MODULE_NAME ble_main #include "nrf_log.h" @@ -40,18 +41,41 @@ NRF_LOG_MODULE_REGISTER(); #define NEXT_CONN_PARAMS_UPDATE_DELAY APP_TIMER_TICKS(30000) /**< Time between each call to sd_ble_gap_conn_param_update after the first call (30 seconds). */ #define MAX_CONN_PARAMS_UPDATE_COUNT 3 /**< Number of attempts before giving up the connection parameter negotiation. */ +// #define BATTERY_LEVEL_MEAS_INTERVAL APP_TIMER_TICKS(1000) /**< Battery level measurement interval (ticks). This value corresponds to 1 seconds. */ +#define BATTERY_LEVEL_MEAS_INTERVAL APP_TIMER_TICKS(5000) /**< Battery level measurement interval (ticks). This value corresponds to N seconds. */ + +#define ADC_REF_VOLTAGE_IN_MILLIVOLTS 600 //!< Reference voltage (in milli volts) used by ADC while doing conversion. +#define ADC_RES_12BIT 16383 //!< Maximum digital value for 14-bit ADC conversion. +#define ADC_PRE_SCALING_COMPENSATION 12 //!< The ADC is configured to use VDD with 1/3 prescaling as input. And hence the result of conversion is to be multiplied by 3 to get the actual value of the battery voltage. + +/**@brief Macro to convert the result of ADC conversion in millivolts. + * + * @param[in] ADC_VALUE ADC result. + * + * @retval Result converted to millivolts. + */ +#define ADC_RESULT_IN_MILLI_VOLTS(ADC_VALUE)\ + ((((ADC_VALUE) * ADC_REF_VOLTAGE_IN_MILLIVOLTS) / ADC_RES_12BIT) * ADC_PRE_SCALING_COMPENSATION) + +APP_TIMER_DEF(m_battery_timer_id); /**< Battery measurement timer. */ +BLE_BAS_DEF(m_bas); /**< Battery service instance. */ BLE_NUS_DEF(m_nus, NRF_SDH_BLE_TOTAL_LINK_COUNT); /**< BLE NUS service instance. */ NRF_BLE_GATT_DEF(m_gatt); /**< GATT module instance. */ NRF_BLE_QWR_DEF(m_qwr); /**< Context for the Queued Write module.*/ BLE_ADVERTISING_DEF(m_advertising); /**< Advertising module instance. */ +uint16_t batt_lvl_in_milli_volts = 0; +uint8_t percentage_batt_lvl = 0; +static nrf_saadc_value_t adc_buf[2]; static uint16_t m_conn_handle = BLE_CONN_HANDLE_INVALID; /**< Handle of the current connection. */ static uint16_t m_ble_nus_max_data_len = BLE_GATT_ATT_MTU_DEFAULT - 3; /**< Maximum length of data (in bytes) that can be transmitted to the peer by the Nordic UART service module. */ static ble_uuid_t m_adv_uuids[] = /**< Universally unique service identifier. */ { - {BLE_UUID_NUS_SERVICE, NUS_SERVICE_UUID_TYPE} + {BLE_UUID_NUS_SERVICE, NUS_SERVICE_UUID_TYPE}, + {BLE_UUID_BATTERY_SERVICE, BLE_UUID_TYPE_BLE}, }; volatile bool g_is_ble_connected = false; +volatile bool g_is_low_battery_shutdown = false; /**@brief Function for the GAP initialization. @@ -81,6 +105,30 @@ static void gap_params_init(void) APP_ERROR_CHECK(err_code); } +/**@brief Function for handling the Battery Service events. + * + * @details This function will be called for all Battery Service events which are passed to the + | application. + * + * @param[in] p_bas Battery Service structure. + * @param[in] p_evt Event received from the Battery Service. + */ +static void on_bas_evt(ble_bas_t * p_bas, ble_bas_evt_t * p_evt) +{ + switch (p_evt->evt_type) + { + case BLE_BAS_EVT_NOTIFICATION_ENABLED: + break; // BLE_BAS_EVT_NOTIFICATION_ENABLED + + case BLE_BAS_EVT_NOTIFICATION_DISABLED: + break; // BLE_BAS_EVT_NOTIFICATION_DISABLED + + default: + // No implementation needed. + break; + } +} + /**@brief Function for handling the data from the Nordic UART Service. * * @details This function will process the data received from the Nordic UART BLE Service @@ -143,27 +191,128 @@ static void nrf_qwr_error_handler(uint32_t nrf_error) APP_ERROR_HANDLER(nrf_error); } +__INLINE uint32_t map(uint32_t x, uint32_t in_min, uint32_t in_max, uint32_t out_min, uint32_t out_max) +{ + return (uint32_t)((x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min); +} + +//صѹٷֱȼ +uint32_t BATVOL2PERCENT(uint16_t VOL) +{ + //100% 4.20V 1 + //90 % 4.06V 80%-100% + //80 % 3.98V 1 + //70 % 3.92V 60%-80% + //60 % 3.87V 1 + //50 % 3.82V 40%-60% + //40 % 3.79V 1 + //30 % 3.77V 20%-40% + //20 % 3.74V 1 + //10 % 3.68V 5%-20% + //5 % 3.45V 1 ػ + //0 % 3.00V + //#define P100VOL 4200 + //#define P80VOL 3980 + //#define P60VOL 3870 + //#define P40VOL 3790 + //#define P20VOL 3740 + //#define P5VOL 3450 + + //100% 4.20V 1 + //90 % 4.00V 80%-100% + //80 % 3.89V 1 + //70 % 3.79V 60%-80% + //60 % 3.70V 1 + //50 % 3.62V 40%-60% + //40 % 3.57V 1 + //30 % 3.53V 20%-40% + //20 % 3.51V 1 + //10 % 3.46V 5%-20% + //5 % 3.43V 1 ػ + //0 % 3.00V +#define P100VOL 4200 +#define P80VOL 3890 +#define P60VOL 3700 +#define P40VOL 3570 +#define P20VOL 3510 +#define P5VOL 3230 + + + if(VOL > P80VOL) + { + //80-100 + return map(VOL, P80VOL, P100VOL, 80, 100); + } + else if(VOL > P60VOL) + { + //60-80 + return map(VOL, P60VOL, P80VOL, 60, 80); + } + else if(VOL > P40VOL) + { + //40-60 + return map(VOL, P40VOL, P60VOL, 40, 60); + } + else if(VOL > P20VOL) + { + //20-60 + return map(VOL, P20VOL, P40VOL, 20, 40); + } + else if(VOL > P5VOL) + { + //5-20 + return map(VOL, P5VOL, P20VOL, 5, 20); + } + else + { + //<5 + return 0; + } +} + /**@brief Function for initializing services that will be used by the application. */ static void services_init(void) { uint32_t err_code; - ble_nus_init_t nus_init; - nrf_ble_qwr_init_t qwr_init = {0}; + // ------------------------------------------------------------- // Initialize Queued Write Module. + nrf_ble_qwr_init_t qwr_init = {0}; qwr_init.error_handler = nrf_qwr_error_handler; err_code = nrf_ble_qwr_init(&m_qwr, &qwr_init); APP_ERROR_CHECK(err_code); + + // ------------------------------------------------------------- // Initialize NUS. + ble_nus_init_t nus_init; memset(&nus_init, 0, sizeof(nus_init)); nus_init.data_handler = nus_data_handler; err_code = ble_nus_init(&m_nus, &nus_init); APP_ERROR_CHECK(err_code); + + // ------------------------------------------------------------- + // battery service + + ble_bas_init_t bas_init_obj; + + memset(&bas_init_obj, 0, sizeof(bas_init_obj)); + + bas_init_obj.evt_handler = on_bas_evt; + bas_init_obj.support_notification = true; + bas_init_obj.p_report_ref = NULL; + bas_init_obj.initial_batt_level = 100; + + bas_init_obj.bl_rd_sec = SEC_OPEN; + bas_init_obj.bl_cccd_wr_sec = SEC_OPEN; + bas_init_obj.bl_report_rd_sec = SEC_OPEN; + + err_code = ble_bas_init(&m_bas, &bas_init_obj); + APP_ERROR_CHECK(err_code); } /**@brief Function for handling an event from the Connection Parameters Module. @@ -405,10 +554,104 @@ void advertising_start(void) APP_ERROR_CHECK(err_code); } + + +/**@brief Function for handling the ADC interrupt. + * + * @details This function will fetch the conversion result from the ADC, convert the value into + * percentage and send it to peer. + */ +void saadc_event_handler(nrf_drv_saadc_evt_t const * p_event) +{ + if (p_event->type == NRF_DRV_SAADC_EVT_DONE) + { + nrf_saadc_value_t adc_result; + uint32_t err_code; + + adc_result = p_event->data.done.p_buffer[0]; + // NRF_LOG_INFO("ADC sample value = %d", adc_result); + + err_code = nrf_drv_saadc_buffer_convert(p_event->data.done.p_buffer, 1); + APP_ERROR_CHECK(err_code); + + batt_lvl_in_milli_volts = ADC_RESULT_IN_MILLI_VOLTS(adc_result) + 100; + NRF_LOG_INFO("batt_lvl_in_milli_volts: %d", batt_lvl_in_milli_volts); + percentage_batt_lvl = BATVOL2PERCENT(batt_lvl_in_milli_volts); + + // if battery service is notification enable, we can send msg to device. + err_code = ble_bas_battery_level_update(&m_bas, percentage_batt_lvl, BLE_CONN_HANDLE_ALL); + if ((err_code != NRF_SUCCESS) && + (err_code != NRF_ERROR_INVALID_STATE) && + (err_code != NRF_ERROR_RESOURCES) && + (err_code != NRF_ERROR_BUSY) && + (err_code != BLE_ERROR_GATTS_SYS_ATTR_MISSING) + ) + { + APP_ERROR_HANDLER(err_code); + } + + // check low battery level, if level == 0, we can try to shutdown. + if (percentage_batt_lvl == 0) { + NRF_LOG_INFO("battery too low, try to shutdown..."); + g_is_low_battery_shutdown = true; + sleep_timer_start(SLEEP_NO_BATTERY_SHUTDOWN); + } else { + g_is_low_battery_shutdown = false; + } + } +} + +/**@brief Function for configuring ADC to do battery level conversion. + */ +static void adc_configure(void) +{ + ret_code_t err_code = nrf_drv_saadc_init(NULL, saadc_event_handler); + APP_ERROR_CHECK(err_code); + + nrf_saadc_channel_config_t config = NRF_DRV_SAADC_DEFAULT_CHANNEL_CONFIG_SE(BAT_SENSE); + err_code = nrf_drv_saadc_channel_init(0, &config); + APP_ERROR_CHECK(err_code); + + err_code = nrf_drv_saadc_buffer_convert(&adc_buf[0], 1); + APP_ERROR_CHECK(err_code); + + err_code = nrf_drv_saadc_buffer_convert(&adc_buf[1], 1); + APP_ERROR_CHECK(err_code); +} + +/**@brief Function for handling the Battery measurement timer timeout. + * + * @details This function will be called each time the battery level measurement timer expires. + * This function will start the ADC. + * + * @param[in] p_context Pointer used for passing some arbitrary information (context) from the + * app_start_timer() call to the timeout handler. + */ +static void battery_level_meas_timeout_handler(void * p_context) +{ + UNUSED_PARAMETER(p_context); + + ret_code_t err_code; + err_code = nrf_drv_saadc_sample(); + APP_ERROR_CHECK(err_code); +} + +void create_battery_timer(void) { + ret_code_t err_code; + // Create battery timer. + err_code = app_timer_create(&m_battery_timer_id, APP_TIMER_MODE_REPEATED, battery_level_meas_timeout_handler); + APP_ERROR_CHECK(err_code); + // Start battery timer + err_code = app_timer_start(m_battery_timer_id, BATTERY_LEVEL_MEAS_INTERVAL, NULL); + APP_ERROR_CHECK(err_code); +} + /** * @brief Function for init ble slave. */ void ble_slave_init(void) { + adc_configure(); // ADCʼ + create_battery_timer(); // ص¶ʱ ble_stack_init(); // BLEЭջʼ gap_params_init(); // GAPʼ gatt_init(); // GATTЭʼ diff --git a/firmware/application/src/ble_main.h b/firmware/application/src/ble_main.h index 5d103fa..875eebf 100644 --- a/firmware/application/src/ble_main.h +++ b/firmware/application/src/ble_main.h @@ -1,6 +1,11 @@ #ifndef BLE_MAIN_H #define BLE_MAIN_H +#include "ble_gatts.h" +#include "ble_nus.h" +#include "ble_bas.h" + + void ble_slave_init(void); void advertising_start(void); void nus_data_reponse(uint8_t *p_data, uint16_t length); diff --git a/firmware/application/src/rfid/nfctag/lf/lf_tag_em.c b/firmware/application/src/rfid/nfctag/lf/lf_tag_em.c index 904885a..7c97b64 100644 --- a/firmware/application/src/rfid/nfctag/lf/lf_tag_em.c +++ b/firmware/application/src/rfid/nfctag/lf/lf_tag_em.c @@ -42,7 +42,8 @@ static volatile bool m_is_lf_emulating = false; const nrfx_timer_t m_timer_send_id = NRFX_TIMER_INSTANCE(3); // 缓存标签类型 static tag_specific_type_t m_tag_type = TAG_TYPE_UNKNOWN; - +// 当前是否需要发送重新进入LF状态的第二个沿 +static bool m_is_send_reboardcast_last_edge; /** * @brief 将EM410X的卡号转为U64的内存布局，计算奇偶校验位 @@ -74,8 +75,8 @@ uint64_t em410x_id_to_memory64(uint8_t id[5]) { // 好了，到了目前最关键的时候了，现在需要赋值和计算奇偶校验位了 // 1、先把前导码给赋值了 - memory.bit.h00 = memory.bit.h01 = memory.bit.h02 = - memory.bit.h03 = memory.bit.h04 = memory.bit.h05 = + memory.bit.h00 = memory.bit.h01 = memory.bit.h02 = + memory.bit.h03 = memory.bit.h04 = memory.bit.h05 = memory.bit.h06 = memory.bit.h07 = memory.bit.h08 = 1; // 2、把8bit的版本或者自定义ID给赋值了 memory.bit.d00 = GETBIT(id[0], 7); memory.bit.d01 = GETBIT(id[0], 6); memory.bit.d02 = GETBIT(id[0], 5); memory.bit.d03 = GETBIT(id[0], 4); @@ -118,7 +119,8 @@ uint64_t em410x_id_to_memory64(uint8_t id[5]) { /** * @brief 判断场状态 */ -static inline bool is_lf_field_exists(void) { + bool lf_is_field_exists(void) { + nrf_drv_lpcomp_enable(); bsp_delay_us(20); // 延迟一段时间再采样，避免误判 nrf_lpcomp_task_trigger(NRF_LPCOMP_TASK_SAMPLE); // 触发一次采样 return nrf_lpcomp_result_get() == 1; // 判断LF场状态的采样结果 @@ -129,27 +131,32 @@ void timer_ce_handler(nrf_timer_event_t event_type, void* p_context) { // 因为我们配置的是使用CC通道2，所以事件回调 // 函数中判断NRF_TIMER_EVENT_COMPARE0事件 case NRF_TIMER_EVENT_COMPARE2: { - if (m_is_send_first_edge) { - if (GETBIT(m_id_bit_data, m_bit_send_position)) { - // 发送 1 的第一个沿 - ANT_TO_MOD(); + if(m_is_send_reboardcast_last_edge){ + m_is_send_reboardcast_last_edge = false; + ANT_TO_MOD(); + }else{ + if (m_is_send_first_edge) { + if (GETBIT(m_id_bit_data, m_bit_send_position)) { + // 发送 1 的第一个沿 + ANT_TO_MOD(); + } else { + // 发送 0 的第一个沿 + ANT_NO_MOD(); + } + m_is_send_first_edge = false; // 下次发送第二个沿 } else { - // 发送 0 的第一个沿 - ANT_NO_MOD(); - } - m_is_send_first_edge = false; // 下次发送第二个沿 - } else { - if (GETBIT(m_id_bit_data, m_bit_send_position)) { - // 发送 1 的第二个沿 - ANT_NO_MOD(); - } else { - // 发送 0 的第二个沿 - ANT_TO_MOD(); - } - m_is_send_first_edge = true; // 下次发送第一个沿 - if (++m_bit_send_position >= LF_125KHZ_EM410X_BIT_SIZE) { - m_bit_send_position = 0; // 广播一次成功，bit位置归零 - ++m_send_id_count; // 统计广播次数 + if (GETBIT(m_id_bit_data, m_bit_send_position)) { + // 发送 1 的第二个沿 + ANT_NO_MOD(); + } else { + // 发送 0 的第二个沿 + ANT_TO_MOD(); + } + m_is_send_first_edge = true; // 下次发送第一个沿 + if (++m_bit_send_position >= LF_125KHZ_EM410X_BIT_SIZE) { + m_bit_send_position = 0; // 广播一次成功，bit位置归零 + ++m_send_id_count; // 统计广播次数 + } } } // 如果广播次数超过上限次数，则重新比较场状态，根据新的场状态选择是否继续模拟标签 @@ -157,19 +164,19 @@ void timer_ce_handler(nrf_timer_event_t event_type, void* p_context) { m_send_id_count = 0; // 广播次数达到上限，重新识别场状态并且重新统计广播次数 ANT_NO_MOD(); // 确保天线不短路而导致无法获得RSSI状态 nrfx_timer_disable(&m_timer_send_id); // 关闭广播场的定时器 - + // 我们不需要任何的事件，仅仅需要检测一下场的状态 NRF_LPCOMP->INTENCLR = LPCOMP_INTENCLR_CROSS_Msk | LPCOMP_INTENCLR_UP_Msk | LPCOMP_INTENCLR_DOWN_Msk | LPCOMP_INTENCLR_READY_Msk; - nrf_drv_lpcomp_enable(); // 重启比较器，以便可以重新比较场状态 - if (is_lf_field_exists()) { + if (lf_is_field_exists()) { nrf_drv_lpcomp_disable(); nrfx_timer_enable(&m_timer_send_id); // 打开广播场的定时器，继续模拟 + m_is_send_reboardcast_last_edge = true; // 如果继续的话需要发送0的后一个沿 } else { // 开启事件中断，让下次场事件可以正常出入 - NRF_LPCOMP->INTENSET = LPCOMP_INTENCLR_CROSS_Msk | LPCOMP_INTENCLR_UP_Msk | LPCOMP_INTENCLR_DOWN_Msk | LPCOMP_INTENCLR_READY_Msk; g_is_tag_emulating = false; // 重设模拟中的标志位 m_is_lf_emulating = false; TAG_FIELD_LED_OFF() // 确保关闭LF的场状态的指示灯 + NRF_LPCOMP->INTENSET = LPCOMP_INTENCLR_CROSS_Msk | LPCOMP_INTENCLR_UP_Msk | LPCOMP_INTENCLR_DOWN_Msk | LPCOMP_INTENCLR_READY_Msk; sleep_timer_start(SLEEP_DELAY_MS_FIELD_125KHZ_LOST); // 启动进入休眠的定时器 NRF_LOG_INFO("LF FIELD LOST"); } @@ -202,57 +209,46 @@ static void lpcomp_event_handler(nrf_lpcomp_event_t event) { // 设置模拟状态标志位 m_is_lf_emulating = true; g_is_tag_emulating = true; - + // 模拟卡状态应当关闭USB灯效 g_usb_led_marquee_enable = false; // LED状态更新 set_slot_light_color(2); TAG_FIELD_LED_ON() - + // 无论如何，每次场状态发现变化都需要重置发送的bit位置 m_send_id_count = 0; m_bit_send_position = 0; m_is_send_first_edge = true; - + m_is_send_reboardcast_last_edge = false; + // 开启精准的硬件定时器去广播卡号 nrfx_timer_enable(&m_timer_send_id); - + NRF_LOG_INFO("LF FIELD DETECTED"); } } static void lf_sense_enable(void) { ret_code_t err_code; - - nrf_drv_lpcomp_config_t config = NRF_DRV_LPCOMP_DEFAULT_CONFIG; - config.hal.reference = NRF_LPCOMP_REF_SUPPLY_1_16; // 参考电压 - config.input = LF_RSSI; // 输入脚 - config.hal.detection = NRF_LPCOMP_DETECT_UP; // 默认上升沿触发 - config.hal.hyst = NRF_LPCOMP_HYST_50mV; // 防抖，避免频繁中断 - // initialize LPCOMP driver, from this point LPCOMP will be active and provided - // event handler will be executed when defined action is detected + nrf_drv_lpcomp_config_t config = NRF_DRV_LPCOMP_DEFAULT_CONFIG; + config.hal.reference = NRF_LPCOMP_REF_SUPPLY_1_16; + config.input = LF_RSSI; + config.hal.detection = NRF_LPCOMP_DETECT_UP; + config.hal.hyst = NRF_LPCOMP_HYST_50mV; + err_code = nrf_drv_lpcomp_init(&config, lpcomp_event_handler); APP_ERROR_CHECK(err_code); - nrf_drv_lpcomp_enable(); // 使能低功耗比较器 - - // 初始化用于震荡曼彻斯特波的定时器 - uint32_t time_us = LF_125KHZ_EM410X_BIT_CLOCK; // 定时时间250us - // 保存定时时间对应的Ticks - uint32_t time_ticks; - // 定义定时器配置结构体，并使用默认配置参数初始化结构体 + + // TAG id broadcast nrfx_timer_config_t timer_cfg = NRFX_TIMER_DEFAULT_CONFIG; - // 初始化定时器，初始化时会注册timer_led_event_handler事件回调函数 err_code = nrfx_timer_init(&m_timer_send_id, &timer_cfg, timer_ce_handler); APP_ERROR_CHECK(err_code); - // 定时时间转换为ticks - time_ticks = nrfx_timer_us_to_ticks(&m_timer_send_id, time_us); - // 设置定时器捕获/比较通道及该通道的比较值，使能通道的比较中断 - nrfx_timer_extended_compare(&m_timer_send_id, NRF_TIMER_CC_CHANNEL2, time_ticks, NRF_TIMER_SHORT_COMPARE2_CLEAR_MASK, true); + nrfx_timer_extended_compare(&m_timer_send_id, NRF_TIMER_CC_CHANNEL2, nrfx_timer_us_to_ticks(&m_timer_send_id, LF_125KHZ_EM410X_BIT_CLOCK), NRF_TIMER_SHORT_COMPARE2_CLEAR_MASK, true); - // 如果一初始化完就发现当前处于场中，并且没有处于广播状态，就主动触发广播 - if (!m_is_lf_emulating && is_lf_field_exists()) { + if (lf_is_field_exists() && !m_is_lf_emulating) { lpcomp_event_handler(NRF_LPCOMP_EVENT_UP); } } @@ -277,7 +273,7 @@ void lf_tag_125khz_sense_switch(bool enable) { nrf_gpio_cfg_output(LF_MOD); // 默认不短路天线（短路会导致RSSI无法判断） ANT_NO_MOD(); - + // 首次执行或者是禁用状态，只允许初始化 if (m_lf_sense_state == LF_SENSE_STATE_NONE || m_lf_sense_state == LF_SENSE_STATE_DISABLE) { if (enable) { diff --git a/firmware/application/src/rfid/nfctag/lf/lf_tag_em.h b/firmware/application/src/rfid/nfctag/lf/lf_tag_em.h index dbb884c..2650429 100644 --- a/firmware/application/src/rfid/nfctag/lf/lf_tag_em.h +++ b/firmware/application/src/rfid/nfctag/lf/lf_tag_em.h @@ -20,5 +20,6 @@ void lf_tag_125khz_sense_switch(bool enable); int lf_tag_em410x_data_loadcb(tag_specific_type_t type, tag_data_buffer_t* buffer); int lf_tag_em410x_data_savecb(tag_specific_type_t type, tag_data_buffer_t* buffer); bool lf_tag_em410x_data_factory(uint8_t slot, tag_specific_type_t tag_type); +bool lf_is_field_exists(void); #endif diff --git a/firmware/application/src/rfid_main.c b/firmware/application/src/rfid_main.c index 00d6901..d4653ce 100644 --- a/firmware/application/src/rfid_main.c +++ b/firmware/application/src/rfid_main.c @@ -4,7 +4,7 @@ // 设备当前处于的模式 -static device_mode_t rfid_state = DEVICE_MODE_NONE; +device_mode_t rfid_state = DEVICE_MODE_NONE; /** @@ -15,16 +15,16 @@ void reader_mode_enter(void) { #if defined(PROJECT_CHAMELEON_ULTRA) if (rfid_state != DEVICE_MODE_READER) { rfid_state = DEVICE_MODE_READER; + + tag_emulation_sense_end(); // to end tag emulation + // pin init nrf_gpio_cfg_output(LF_ANT_DRIVER); nrf_gpio_cfg_output(READER_POWER); + nrf_gpio_pin_set(READER_POWER); // reader power enable nrf_gpio_cfg_output(HF_ANT_SEL); - // to end tag emulation - tag_emulation_sense_end(); - // reader power enable - nrf_gpio_pin_set(READER_POWER); - // hf ant switch to reader mode - nrf_gpio_pin_clear(HF_ANT_SEL); + nrf_gpio_pin_clear(HF_ANT_SEL); // hf ant switch to reader mode + // init reader lf_125khz_radio_init(); pcd_14a_reader_init(); @@ -41,19 +41,19 @@ void tag_mode_enter(void) { rfid_state = DEVICE_MODE_TAG; #if defined(PROJECT_CHAMELEON_ULTRA) - // pin init - nrf_gpio_cfg_output(LF_ANT_DRIVER); - nrf_gpio_cfg_output(READER_POWER); - nrf_gpio_cfg_output(HF_ANT_SEL); // uninit reader lf_125khz_radio_uninit(); pcd_14a_reader_uninit(); - // lf reader driver - nrf_gpio_pin_clear(LF_ANT_DRIVER); - // reader power disable - nrf_gpio_pin_clear(READER_POWER); - // hf ant switch to emulation mode - nrf_gpio_pin_set(HF_ANT_SEL); + + // pin init + nrf_gpio_cfg_output(LF_ANT_DRIVER); + nrf_gpio_pin_clear(LF_ANT_DRIVER); // lf reader driver + + nrf_gpio_cfg_output(READER_POWER); + nrf_gpio_pin_clear(READER_POWER); // reader power disable + + nrf_gpio_cfg_output(HF_ANT_SEL); + nrf_gpio_pin_set(HF_ANT_SEL); // hf ant switch to emulation mode #endif // to run tag emulation diff --git a/firmware/application/src/sdk_config.h b/firmware/application/src/sdk_config.h index 26f13c6..1e990e4 100644 --- a/firmware/application/src/sdk_config.h +++ b/firmware/application/src/sdk_config.h @@ -324,7 +324,7 @@ // BLE_BAS_ENABLED - ble_bas - Battery Service //========================================================== #ifndef BLE_BAS_ENABLED -#define BLE_BAS_ENABLED 0 +#define BLE_BAS_ENABLED 1 #endif // BLE_BAS_CONFIG_LOG_ENABLED - Enables logging in the module. //========================================================== @@ -3329,7 +3329,7 @@ // NRFX_SAADC_ENABLED - nrfx_saadc - SAADC peripheral driver //========================================================== #ifndef NRFX_SAADC_ENABLED -#define NRFX_SAADC_ENABLED 0 +#define NRFX_SAADC_ENABLED 1 #endif // NRFX_SAADC_CONFIG_RESOLUTION - Resolution @@ -3339,7 +3339,7 @@ // <3=> 14 bit #ifndef NRFX_SAADC_CONFIG_RESOLUTION -#define NRFX_SAADC_CONFIG_RESOLUTION 1 +#define NRFX_SAADC_CONFIG_RESOLUTION 3 #endif // NRFX_SAADC_CONFIG_OVERSAMPLE - Sample period @@ -5357,7 +5357,7 @@ // SAADC_ENABLED - nrf_drv_saadc - SAADC peripheral driver - legacy layer //========================================================== #ifndef SAADC_ENABLED -#define SAADC_ENABLED 0 +#define SAADC_ENABLED 1 #endif // SAADC_CONFIG_RESOLUTION - Resolution @@ -5367,7 +5367,7 @@ // <3=> 14 bit #ifndef SAADC_CONFIG_RESOLUTION -#define SAADC_CONFIG_RESOLUTION 1 +#define SAADC_CONFIG_RESOLUTION 3 #endif // SAADC_CONFIG_OVERSAMPLE - Sample period @@ -6528,7 +6528,7 @@ // Setting string to NULL disables that string. // The order of manufacturer names must be the same like in @ref APP_USBD_STRINGS_LANGIDS. #ifndef APP_USBD_STRINGS_MANUFACTURER -#define APP_USBD_STRINGS_MANUFACTURER APP_USBD_STRING_DESC("Porxgrind") +#define APP_USBD_STRINGS_MANUFACTURER APP_USBD_STRING_DESC("Proxgrind") #endif // diff --git a/firmware/application/src/utils/syssleep.c b/firmware/application/src/utils/syssleep.c index fec7941..b302da8 100644 --- a/firmware/application/src/utils/syssleep.c +++ b/firmware/application/src/utils/syssleep.c @@ -65,6 +65,7 @@ void sleep_timer_start(uint32_t time_ms) { void sleep_system_run(void (*sysOffSleep)(), void (*sysOnSleep)()) { // No task to process, sleep enter if (m_system_off_enter) { + m_system_off_enter = false; // Enter Sleep(System_OFF sleep mode) zzzzz..... sysOffSleep(); } else { diff --git a/firmware/application/src/utils/syssleep.h b/firmware/application/src/utils/syssleep.h index 85d6499..6a44619 100644 --- a/firmware/application/src/utils/syssleep.h +++ b/firmware/application/src/utils/syssleep.h @@ -10,10 +10,11 @@ // 运行态重新延迟 #define SLEEP_DELAY_MS_BUTTON_CLICK 4000 // 按钮点击的休眠延迟 -#define SLEEP_DELAY_MS_FIELD_NFC_LOST 2000 // 高频模拟卡离开场后的休眠延迟 -#define SLEEP_DELAY_MS_FIELD_125KHZ_LOST 2000 // 低频模拟卡离开场后的休眠延迟 +#define SLEEP_DELAY_MS_FIELD_NFC_LOST 3000 // 高频模拟卡离开场后的休眠延迟 +#define SLEEP_DELAY_MS_FIELD_125KHZ_LOST 3000 // 低频模拟卡离开场后的休眠延迟 #define SLEEP_DELAY_MS_BLE_DISCONNECTED 4000 // BLE断开后的休眠延迟 #define SLEEP_DELAY_MS_USB_POWER_DISCONNECTED 3000 // USB供电断开后的休眠延迟 +#define SLEEP_NO_BATTERY_SHUTDOWN 1 // 低电量关机 void sleep_timer_init(void); diff --git a/firmware/bootloader/bootloader.ld b/firmware/bootloader/bootloader.ld index d7750c4..ccaa7a2 100644 --- a/firmware/bootloader/bootloader.ld +++ b/firmware/bootloader/bootloader.ld @@ -5,7 +5,7 @@ GROUP(-lgcc -lc -lnosys) MEMORY { - FLASH (rx) : ORIGIN = 0xf3000, LENGTH = 0xb000 + FLASH (rx) : ORIGIN = 0xF3000, LENGTH = 0xB000 RAM (rwx) : ORIGIN = 0x20005978, LENGTH = 0x32688 uicr_bootloader_start_address (r) : ORIGIN = 0x10001014, LENGTH = 0x4 bootloader_settings_page (r) : ORIGIN = 0x000FF000, LENGTH = 0x1000 diff --git a/firmware/bootloader/src/main.c b/firmware/bootloader/src/main.c index 106c321..8337c90 100644 --- a/firmware/bootloader/src/main.c +++ b/firmware/bootloader/src/main.c @@ -100,7 +100,6 @@ void app_error_handler_bare(uint32_t error_code) on_error(); } - static uint8_t m_led_flash_state = 0; static bool m_led_flash_setp = 0; static nrfx_systick_state_t systick; @@ -183,7 +182,7 @@ static void dfu_observer(nrf_dfu_evt_type_t evt_type) /**@brief Function for application main entry. */ int main(void) { - uint32_t ret_val; + ret_code_t ret_val; // Must to init hardware connect. hw_connect_init(); diff --git a/firmware/bootloader/src/sdk_config.h b/firmware/bootloader/src/sdk_config.h index 5d015d3..6c86bda 100644 --- a/firmware/bootloader/src/sdk_config.h +++ b/firmware/bootloader/src/sdk_config.h @@ -204,7 +204,7 @@ // If 0, no inactivity timer will be used. Values 1-99 are invalid. #ifndef NRF_BL_DFU_INACTIVITY_TIMEOUT_MS -#define NRF_BL_DFU_INACTIVITY_TIMEOUT_MS 120000 +#define NRF_BL_DFU_INACTIVITY_TIMEOUT_MS 30000 #endif // diff --git a/firmware/common/hw_connect.c b/firmware/common/hw_connect.c index 557486b..4c0f268 100644 --- a/firmware/common/hw_connect.c +++ b/firmware/common/hw_connect.c @@ -34,7 +34,9 @@ uint32_t g_button2; uint32_t g_lf_mod; uint32_t g_lf_rssi_pin; nrf_lpcomp_input_t g_lf_rssi; -uint32_t g_bat_sense; +uint32_t g_bat_sense_pin; +nrf_saadc_input_t g_bat_sense; + #if defined(PROJECT_CHAMELEON_ULTRA) uint32_t g_lf_ant_driver; @@ -99,104 +101,74 @@ void hw_connect_init(void) { // TODO 请实现此处，实现硬件版本号的读取 // 测试的时候可以直接改写此版本号 - m_hw_ver = 2; + m_hw_ver = 1; #if defined(PROJECT_CHAMELEON_ULTRA) if (m_hw_ver == 1) { - LED_FIELD = (NRF_GPIO_PIN_MAP(1, 1)); - LED_R = (NRF_GPIO_PIN_MAP(0, 24)); - LED_G = (NRF_GPIO_PIN_MAP(0, 22)); - LED_B = (NRF_GPIO_PIN_MAP(1, 0)); - LED_8 = (NRF_GPIO_PIN_MAP(0, 20)); - LED_7 = (NRF_GPIO_PIN_MAP(0, 17)); - LED_6 = (NRF_GPIO_PIN_MAP(0, 15)); - LED_5 = (NRF_GPIO_PIN_MAP(0, 13)); - LED_4 = (NRF_GPIO_PIN_MAP(0, 12)); - LED_3 = (NRF_GPIO_PIN_MAP(1, 9)); - LED_2 = (NRF_GPIO_PIN_MAP(0, 8)); - LED_1 = (NRF_GPIO_PIN_MAP(0, 6)); - RGB_LIST_NUM = 8; - RGB_CTRL_NUM = 3; + LED_FIELD = (NRF_GPIO_PIN_MAP(1, 1)); + LED_R = (NRF_GPIO_PIN_MAP(0, 24)); + LED_G = (NRF_GPIO_PIN_MAP(0, 22)); + LED_B = (NRF_GPIO_PIN_MAP(1, 0)); + LED_1 = (NRF_GPIO_PIN_MAP(0, 20)); + LED_2 = (NRF_GPIO_PIN_MAP(0, 17)); + LED_3 = (NRF_GPIO_PIN_MAP(0, 15)); + LED_4 = (NRF_GPIO_PIN_MAP(0, 13)); + LED_5 = (NRF_GPIO_PIN_MAP(0, 12)); + LED_6 = (NRF_GPIO_PIN_MAP(1, 9)); + LED_7 = (NRF_GPIO_PIN_MAP(0, 8)); + LED_8 = (NRF_GPIO_PIN_MAP(0, 6)); + RGB_LIST_NUM = 8; + RGB_CTRL_NUM = 3; - LF_ANT_DRIVER = (NRF_GPIO_PIN_MAP(0, 31)); - LF_OA_OUT = (NRF_GPIO_PIN_MAP(1, 15)); - LF_MOD = (NRF_GPIO_PIN_MAP(1, 13)); - LF_RSSI_PIN = (NRF_GPIO_PIN_MAP(0, 2)); - LF_RSSI = NRF_LPCOMP_INPUT_0; + LF_ANT_DRIVER = (NRF_GPIO_PIN_MAP(0, 31)); + LF_OA_OUT = (NRF_GPIO_PIN_MAP(0, 29)); + LF_MOD = (NRF_GPIO_PIN_MAP(1, 13)); + LF_RSSI_PIN = (NRF_GPIO_PIN_MAP(0, 2)); + LF_RSSI = NRF_LPCOMP_INPUT_0; - HF_SPI_SELECT = (NRF_GPIO_PIN_MAP(1, 6)); - HF_SPI_MISO = (NRF_GPIO_PIN_MAP(0, 11)); - HF_SPI_MOSI = (NRF_GPIO_PIN_MAP(1, 7)); - HF_SPI_SCK = (NRF_GPIO_PIN_MAP(1, 4)); - HF_ANT_SEL = (NRF_GPIO_PIN_MAP(1, 10)); + HF_SPI_SELECT = (NRF_GPIO_PIN_MAP(1, 6)); + HF_SPI_MISO = (NRF_GPIO_PIN_MAP(0, 11)); + HF_SPI_MOSI = (NRF_GPIO_PIN_MAP(1, 7)); + HF_SPI_SCK = (NRF_GPIO_PIN_MAP(1, 4)); + HF_ANT_SEL = (NRF_GPIO_PIN_MAP(1, 10)); - BUTTON_1 = (NRF_GPIO_PIN_MAP(0, 26)); - BUTTON_2 = (NRF_GPIO_PIN_MAP(1, 2)); + READER_POWER = (NRF_GPIO_PIN_MAP(1, 15)); - BAT_SENSE = (NRF_GPIO_PIN_MAP(0, 4)); - READER_POWER = (NRF_GPIO_PIN_MAP(0, 29)); - } - if (m_hw_ver == 2) { - LED_FIELD = (NRF_GPIO_PIN_MAP(1, 1)); - LED_R = (NRF_GPIO_PIN_MAP(0, 24)); - LED_G = (NRF_GPIO_PIN_MAP(0, 22)); - LED_B = (NRF_GPIO_PIN_MAP(1, 0)); - LED_1 = (NRF_GPIO_PIN_MAP(0, 20)); - LED_2 = (NRF_GPIO_PIN_MAP(0, 17)); - LED_3 = (NRF_GPIO_PIN_MAP(0, 15)); - LED_4 = (NRF_GPIO_PIN_MAP(0, 13)); - LED_5 = (NRF_GPIO_PIN_MAP(0, 12)); - LED_6 = (NRF_GPIO_PIN_MAP(1, 9)); - LED_7 = (NRF_GPIO_PIN_MAP(0, 8)); - LED_8 = (NRF_GPIO_PIN_MAP(0, 6)); - RGB_LIST_NUM = 8; - RGB_CTRL_NUM = 3; + BUTTON_2 = (NRF_GPIO_PIN_MAP(0, 26)); + BUTTON_1 = (NRF_GPIO_PIN_MAP(1, 2)); - LF_ANT_DRIVER = (NRF_GPIO_PIN_MAP(0, 31)); - LF_OA_OUT = (NRF_GPIO_PIN_MAP(0, 29)); - LF_MOD = (NRF_GPIO_PIN_MAP(1, 13)); - LF_RSSI_PIN = (NRF_GPIO_PIN_MAP(0, 2)); - LF_RSSI = NRF_LPCOMP_INPUT_0; - - HF_SPI_SELECT = (NRF_GPIO_PIN_MAP(1, 6)); - HF_SPI_MISO = (NRF_GPIO_PIN_MAP(0, 11)); - HF_SPI_MOSI = (NRF_GPIO_PIN_MAP(1, 7)); - HF_SPI_SCK = (NRF_GPIO_PIN_MAP(1, 4)); - HF_ANT_SEL = (NRF_GPIO_PIN_MAP(1, 10)); - - BUTTON_2 = (NRF_GPIO_PIN_MAP(0, 26)); - BUTTON_1 = (NRF_GPIO_PIN_MAP(1, 2)); - - BAT_SENSE = (NRF_GPIO_PIN_MAP(0, 4)); - READER_POWER = (NRF_GPIO_PIN_MAP(1, 15)); + BAT_SENSE_PIN = (NRF_GPIO_PIN_MAP(0, 4)); + BAT_SENSE = NRF_SAADC_INPUT_AIN2; } #endif #if defined(PROJECT_CHAMELEON_LITE) if (m_hw_ver == 1) { - LED_FIELD = (NRF_GPIO_PIN_MAP(1, 1)); - LED_1 = (NRF_GPIO_PIN_MAP(0, 22)); - LED_2 = (NRF_GPIO_PIN_MAP(0, 20)); - LED_3 = (NRF_GPIO_PIN_MAP(0, 17)); - LED_4 = (NRF_GPIO_PIN_MAP(0, 15)); - LED_5 = (NRF_GPIO_PIN_MAP(0, 13)); - LED_6 = (NRF_GPIO_PIN_MAP(0, 6)); - LED_7 = (NRF_GPIO_PIN_MAP(0, 4)); - LED_8 = (NRF_GPIO_PIN_MAP(0, 26)); - LED_R = (NRF_GPIO_PIN_MAP(0, 8)); - LED_G = (NRF_GPIO_PIN_MAP(0, 12)); - LED_B = (NRF_GPIO_PIN_MAP(1, 9)); - RGB_LIST_NUM = 8; - RGB_CTRL_NUM = 3; - - BUTTON_1 = (NRF_GPIO_PIN_MAP(1, 2)); - BUTTON_2 = (NRF_GPIO_PIN_MAP(1, 6)); + LED_FIELD = (NRF_GPIO_PIN_MAP(1, 1)); + LED_1 = (NRF_GPIO_PIN_MAP(0, 22)); + LED_2 = (NRF_GPIO_PIN_MAP(0, 20)); + LED_3 = (NRF_GPIO_PIN_MAP(0, 17)); + LED_4 = (NRF_GPIO_PIN_MAP(0, 15)); + LED_5 = (NRF_GPIO_PIN_MAP(0, 13)); + LED_6 = (NRF_GPIO_PIN_MAP(0, 6)); + LED_7 = (NRF_GPIO_PIN_MAP(0, 4)); + LED_8 = (NRF_GPIO_PIN_MAP(0, 26)); + LED_R = (NRF_GPIO_PIN_MAP(0, 8)); + LED_G = (NRF_GPIO_PIN_MAP(0, 12)); + LED_B = (NRF_GPIO_PIN_MAP(1, 9)); + RGB_LIST_NUM = 8; + RGB_CTRL_NUM = 3; - LF_MOD = (NRF_GPIO_PIN_MAP(1, 4)); - LF_RSSI_PIN = (NRF_GPIO_PIN_MAP(0, 2)); - LF_RSSI = NRF_LPCOMP_INPUT_0; - BAT_SENSE = (NRF_GPIO_PIN_MAP(0, 29)); + LF_MOD = (NRF_GPIO_PIN_MAP(1, 4)); + LF_RSSI_PIN = (NRF_GPIO_PIN_MAP(0, 2)); + LF_RSSI = NRF_LPCOMP_INPUT_0; + + BUTTON_1 = (NRF_GPIO_PIN_MAP(1, 2)); + BUTTON_2 = (NRF_GPIO_PIN_MAP(1, 6)); + + BAT_SENSE_PIN = (NRF_GPIO_PIN_MAP(0, 29)); + BAT_SENSE = NRF_SAADC_INPUT_AIN5; } #endif diff --git a/firmware/common/hw_connect.h b/firmware/common/hw_connect.h index 00af634..45b53e7 100644 --- a/firmware/common/hw_connect.h +++ b/firmware/common/hw_connect.h @@ -5,6 +5,7 @@ #define HW_CONNECT_H_ #include "nrf_lpcomp.h" +#include "nrf_saadc.h" #include "device_info.h" typedef enum { @@ -36,31 +37,32 @@ extern uint32_t g_button2; extern uint32_t g_lf_mod; extern uint32_t g_lf_rssi_pin; extern nrf_lpcomp_input_t g_lf_rssi; -extern uint32_t g_bat_sense; +extern uint32_t g_bat_sense_pin; +extern nrf_saadc_input_t g_bat_sense; -#define LED_FIELD g_led_field -#define LED_1 g_led_1 -#define LED_2 g_led_2 -#define LED_3 g_led_3 -#define LED_4 g_led_4 -#define LED_5 g_led_5 -#define LED_6 g_led_6 -#define LED_7 g_led_7 -#define LED_8 g_led_8 -#define LED_R g_led_r -#define LED_G g_led_g -#define LED_B g_led_b -#define RGB_LIST_NUM g_led_num -#define RGB_CTRL_NUM g_rgb_num -#define BUTTON_1 g_button1 -#define BUTTON_2 g_button2 -#define BUTTON_PULL NRF_GPIO_PIN_PULLDOWN -#define LF_MOD g_lf_mod -#define LF_RSSI_PIN g_lf_rssi_pin -#define LF_RSSI g_lf_rssi -#define BAT_SENSE g_bat_sense - +#define LED_FIELD g_led_field +#define LED_1 g_led_1 +#define LED_2 g_led_2 +#define LED_3 g_led_3 +#define LED_4 g_led_4 +#define LED_5 g_led_5 +#define LED_6 g_led_6 +#define LED_7 g_led_7 +#define LED_8 g_led_8 +#define LED_R g_led_r +#define LED_G g_led_g +#define LED_B g_led_b +#define RGB_LIST_NUM g_led_num +#define RGB_CTRL_NUM g_rgb_num +#define BUTTON_1 g_button1 +#define BUTTON_2 g_button2 +#define BUTTON_PULL NRF_GPIO_PIN_PULLDOWN +#define LF_MOD g_lf_mod +#define LF_RSSI_PIN g_lf_rssi_pin +#define LF_RSSI g_lf_rssi +#define BAT_SENSE_PIN g_bat_sense_pin +#define BAT_SENSE g_bat_sense #if defined(PROJECT_CHAMELEON_ULTRA) extern uint32_t g_lf_ant_driver; diff --git a/firmware/nrf52_sdk/components/libraries/bootloader/nrf_bootloader.c b/firmware/nrf52_sdk/components/libraries/bootloader/nrf_bootloader.c index 15d1390..38975f3 100644 --- a/firmware/nrf52_sdk/components/libraries/bootloader/nrf_bootloader.c +++ b/firmware/nrf52_sdk/components/libraries/bootloader/nrf_bootloader.c @@ -129,6 +129,23 @@ static void do_reset(void * p_context) NVIC_SystemReset(); } +static void do_systemoff(void * p_context) { + UNUSED_PARAMETER(p_context); + + NRF_LOG_FINAL_FLUSH(); + + nrf_delay_ms(NRF_BL_RESET_DELAY_MS); + + // reinit leds status + init_leds(); + set_slot_light_color(3); + // systemoff mode, deepsleep + nrf_power_system_off(); +} + +static bool check_usb_attach(void) { + return nrfx_power_usbstatus_get() != NRFX_POWER_USB_STATE_DISCONNECTED; +} static void bootloader_reset(bool do_backup) { @@ -137,7 +154,12 @@ static void bootloader_reset(bool do_backup) if (do_backup) { m_flash_write_done = false; - nrf_dfu_settings_backup(do_reset); + // The usb is attach, we can reset system. + if (check_usb_attach()) { + nrf_dfu_settings_backup(do_reset); + } else { + nrf_dfu_settings_backup(do_systemoff); + } } else { @@ -161,9 +183,7 @@ static void dfu_observer(nrf_dfu_evt_type_t evt_type) { case NRF_DFU_EVT_DFU_STARTED: case NRF_DFU_EVT_OBJECT_RECEIVED: - nrf_bootloader_dfu_inactivity_timer_restart( - NRF_BOOTLOADER_MS_TO_TICKS(NRF_BL_DFU_INACTIVITY_TIMEOUT_MS), - inactivity_timeout); + nrf_bootloader_dfu_inactivity_timer_restart(NRF_BOOTLOADER_MS_TO_TICKS(NRF_BL_DFU_INACTIVITY_TIMEOUT_MS), inactivity_timeout); break; case NRF_DFU_EVT_DFU_COMPLETED: case NRF_DFU_EVT_DFU_ABORTED: @@ -232,11 +252,9 @@ static void loop_forever(void) #endif /**@brief Function for initializing button used to enter DFU mode. */ -static void dfu_enter_button_init(void) +void dfu_enter_button_init(void) { - nrf_gpio_cfg_sense_input(NRF_BL_DFU_ENTER_METHOD_BUTTON_PIN, - BUTTON_PULL, - NRF_GPIO_PIN_SENSE_LOW); + nrf_gpio_cfg_sense_input(NRF_BL_DFU_ENTER_METHOD_BUTTON_PIN, BUTTON_PULL, NRF_GPIO_PIN_SENSE_HIGH); } #endif @@ -370,7 +388,7 @@ static bool dfu_enter_check(void) bool is_usb_attach = false; // 如果按钮一直是按下的状态，则等待用户释放按钮，期间检测USB插入，如果是插入状态，则进入DFU模式 while (nrf_gpio_pin_read(NRF_BL_DFU_ENTER_METHOD_BUTTON_PIN) == 1) { - is_usb_attach = nrfx_power_usbstatus_get() != NRFX_POWER_USB_STATE_DISCONNECTED; + is_usb_attach = check_usb_attach(); } NRF_LOG_DEBUG("DFU mode requested via button."); // 按钮按下，但是USB没插入，则进入普通APP模式， diff --git a/firmware/nrf52_sdk/components/toolchain/gcc/Makefile.common b/firmware/nrf52_sdk/components/toolchain/gcc/Makefile.common index 773c2b9..e38a64d 100644 --- a/firmware/nrf52_sdk/components/toolchain/gcc/Makefile.common +++ b/firmware/nrf52_sdk/components/toolchain/gcc/Makefile.common @@ -251,7 +251,7 @@ all: $(TARGETS) # Create build directories $(OUTPUT_DIRECTORY): - $(MK) $@ + $(MK) $@ $(OUTPUT_DIRECTORY)/%/.: | $(OUTPUT_DIRECTORY) cd $(OUTPUT_DIRECTORY) && $(MK) $* diff --git a/software/.gitignore b/software/.gitignore index 2fd4b59..0d0c380 100644 --- a/software/.gitignore +++ b/software/.gitignore @@ -3,4 +3,6 @@ bin/ # Ignore the python library cache script/__pycache__ # Ignore the compilers output folder -src/out \ No newline at end of file +src/out +# Ignore the compiled scripts +script/ diff --git a/software/script/chameleon_cli_unit.py b/software/script/chameleon_cli_unit.py index 1a237f3..77dbb09 100644 --- a/software/script/chameleon_cli_unit.py +++ b/software/script/chameleon_cli_unit.py @@ -86,7 +86,7 @@ class BaseCLIUnit: raise NotImplementedError("Please implement this") @staticmethod - def sub_process(cmd, cwd=os.path.abspath("../bin/"), ): + def sub_process(cmd, cwd=os.path.abspath("bin/"), ): class ShadowProcess: def __init__(self): self.time_start = timeit.default_timer() @@ -755,7 +755,7 @@ class SlotIndexRequireUint(DeviceRequiredUnit): parser.add_argument('-s', "--slot", type=int, required=True, help="Slot index", metavar="number", choices=slot_choices) return parser - + class SenseTypeRequireUint(DeviceRequiredUnit): def args_parser(self) -> ArgumentParserNoExit or None: @@ -917,7 +917,7 @@ class HWSlotOpenAll(DeviceRequiredUnit): def args_parser(self) -> ArgumentParserNoExit or None: return None - + # hw slot openall def on_exec(self, args: argparse.Namespace): # what type you need set to default? @@ -948,7 +948,7 @@ class HWDFU(DeviceRequiredUnit): def args_parser(self) -> ArgumentParserNoExit or None: return None - + # hw dfu def on_exec(self, args: argparse.Namespace): print("Application restarting...")