From 3e7ae069bb03e9ebd7f0e69a750dd3450bbea823 Mon Sep 17 00:00:00 2001 From: boseji Date: Thu, 15 Aug 2024 21:55:23 +0530 Subject: [PATCH 1/2] Fixes for issue #21 and Arduino Library Manager Compatibility --- .github/workflows/ci.yaml | 62 ++ CODE_OF_CONDUCT.md | 76 ++ CONTRIBUTING.md | 13 + LICENSE.md | 21 - LICENSE.txt | 677 ++++++++++++++++++ README.md | 128 ++-- avdweb_Switch.cpp | 278 ------- avdweb_Switch.h | 73 -- .../SwitchCallbackExample.ino | 29 +- examples/SwitchExample/SwitchExample.ino | 87 ++- keywords.txt | 3 +- library.properties | 9 +- src/avdweb_Switch.cpp | 321 +++++++++ src/avdweb_Switch.h | 107 +++ 14 files changed, 1403 insertions(+), 481 deletions(-) create mode 100644 .github/workflows/ci.yaml create mode 100644 CODE_OF_CONDUCT.md create mode 100644 CONTRIBUTING.md delete mode 100644 LICENSE.md create mode 100644 LICENSE.txt delete mode 100644 avdweb_Switch.cpp delete mode 100644 avdweb_Switch.h create mode 100644 src/avdweb_Switch.cpp create mode 100644 src/avdweb_Switch.h diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 0000000..b773aa6 --- /dev/null +++ b/.github/workflows/ci.yaml @@ -0,0 +1,62 @@ +name: ci +on: + workflow_dispatch: + push: + branches: + - master + pull_request: + +jobs: + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: arduino/arduino-lint-action@v1 + with: + library-manager: submit + compliance: strict + + format: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.head_ref }} + fetch-depth: 2 + + - uses: jayllyz/clang-format-action@v1 + # Default options + with: + check: false + style: file + extensions: cpp,h,hpp,c,ino + clang-version: latest + + # commit the changes (if there are any) + - name: Commit changes + uses: stefanzweifel/git-auto-commit-action@v5 + with: + commit_message: "clang-format ✅" + branch: ${{ github.head_ref }} + + test: + runs-on: ubuntu-latest + needs: [lint, format] + steps: + - uses: actions/setup-python@v4 + with: + python-version: "3.x" + - uses: actions/checkout@v4 + - uses: actions/checkout@v4 + with: + repository: adafruit/ci-arduino + path: ci + - name: Install the prerequisites + run: bash ci/actions_install.sh + - name: Check for correct code formatting with clang-format + run: python3 ci/run-clang-format.py -e "ci/*" -e "bin/*" -r . + # Make sure to run the `clang-format -i src/*.h src/*.cpp` on the repo. + # To clean the Sources `clang-format -i examples/.../....ino` + + - name: Test the code on supported platforms + run: python3 ci/build_platform.py main_platforms zero feather32u4 pico_rp2040 diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..75080a4 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,76 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, sex characteristics, gender identity and expression, +level of experience, education, socio-economic status, nationality, personal +appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or + advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at git@johanan.dev. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see +https://www.contributor-covenant.org/faq diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..5d5080c --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,13 @@ +# Contribution Guidelines + +This library is the culmination of the expertise of many members of the open source community who have dedicated their time and hard work. The best way to ask for help or propose a new idea is to [create a new issue](https://github.com/avandalen/avdweb_Switch/issues/new) while creating a Pull Request with your code changes allows you to share your own innovations with the rest of the community. + +The following are some guidelines to observe when creating issues or PRs: + +- Be friendly; it is important that we can all enjoy a safe space as we are all working on the same project and it is okay for people to have different ideas + +- [Use code blocks](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet#code); it helps us help you when we can read your code! On that note also refrain from pasting more than 30 lines of code in a post, instead [create a gist](https://gist.github.com/) if you need to share large snippets + +- Use reasonable titles; refrain from using overly long or capitalized titles as they are usually annoying and do little to encourage others to help :smile: + +- Be detailed; refrain from mentioning code problems without sharing your source code and always give information regarding your board and version of the library diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index 136bf62..0000000 --- a/LICENSE.md +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2019 Albert van Dalen - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..1aa1b34 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,677 @@ + 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. + + Switch - Arduino switch and button library with Short/Long Press, + Double Click and Beep. + Copyright (C) 2012-2024 Albert van Dalen + Copyright (C) 2024 Abhijit Bose (aka. Boseji) + + 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: + + Switch Copyright (C) 2012-2024 Albert van Dalen and + Copyright (C) 2024 Abhijit Bose (aka. Boseji) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md index 911d202..ee9c69a 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,9 @@ -## About +# `avdweb_Switch` Library + Arduino switch and button library with Short/Long Press, Double Click and Beep. Supports defining callback functions. -#### General features of the Switch library +## General features of the Switch library - Performs not just de-bouncing, but also de-glitching against EMC pulses. - External pull-up resistors are not required. - Supports also long press, double click, and single click detection. @@ -11,75 +12,76 @@ Supports defining callback functions. ## Introduction Switches and push buttons need debouncing. It is straightforward to do this with software, using this library. -For a complete description see: https://www.avdweb.nl/arduino/hardware-interfacing/simple-switch-debouncer +For a complete description see: + + ## Using the Switch library -Declare each switch or button, by indicanting its GPIO number: +Declare each switch or button, by indicating its GPIO number: -``` +```c Switch buttonGND = Switch(4); // GPIO 4 ``` -The library sets GPIO in input mode with an internal pull-up resistor by default. The constructor accepts several arguments including the particular input mode (e.g. without pull-up), whether voltage level high must be interpreted as on or off (argument `polarity` must indicate the pushed voltage level), and the duration of the time periods that define the behaviour. +The library sets GPIO in input mode with an internal pull-up resistor by default. The constructor accepts several arguments including the particular input mode (e.g. without pull-up), whether voltage level high must be interpreted as on or off (argument `polarity` must indicate the pushed voltage level), and the duration of the time periods that define the behavior. All switches have to be repeatedly polled individually to update the status. This is usually done in the `loop()` function. -``` +```c buttonGND.poll(); ``` After refreshing the status, it can be checked with get functions. For example: -``` +```c if(buttonGND.pushed()) Serial.print("pushed"); ``` -Any event occurs based on the deglitched and debounced pin signal. See below for details on this function of the library that happens transparently. +Any event occurs based on the de-glitched and debounced pin signal. See below for details on this function of the library that happens transparently. Each possible event (each switch-status) has its own get function: -#### switched() - -It returns "true" if the pin voltage level changed, no matter the direction (from low to high or from high to low). +### `switched()` -#### on() +It returns `true` if the pin voltage level changed, no matter the direction (from low to high or from high to low). -It returns "true" if the pin voltage agrees with the one defined by `polarity` (which is LOW by default). Use only for toggle switches. It returns "true" as long as the switch is in the "on" position. The polarity of the switch in the "on" position has to be filled in correctly. There is no off() function, this is simply !on(). +### `on()` -#### pushed() +It returns `true` if the pin voltage agrees with the one defined by `polarity` (which is LOW by default). Use only for toggle switches. It returns "true" as long as the switch is in the "on" position. The polarity of the switch in the "on" position has to be filled in correctly. There is no `off()` function, this is simply `!on()`. -It returns "true" if a button was pushed (switched towards the on position). Use only for push buttons. Note that this provides instant response and can be used as "single-click" if "double-click" and "long-press" are not watched events. "Pushed" occurs simultaneously with "double-click" and "long-press". +### `pushed()` -#### released() +It returns `true` if a button was pushed (switched towards the on position). Use only for push buttons. Note that this provides instant response and can be used as **"single-click"** if **"double-click"** and **"long-press"** are not watched events. **"Pushed"** occurs simultaneously with **"double-click"** and **"long-press"**. -It returns "true" if a push button was released (switched towards the off position), this will however rarely be used. +### `released()` -#### longPress() +It returns `true` if a push button was released (switched towards the off position), this will however rarely be used. -It returns "true" if a push button is pressed longer than 300ms (by default). Note that a longPress() always will be preceded by pushed() from the first push. +### `longPress()` -#### doubleClick() +It returns `true` if a push button is pressed longer than `300ms` (by default). Note that a `longPress()` always will be preceded by `pushed()` from the first push. -It returns "true" if a push button is double clicked within 250ms (by default). Note that a doubleClick() always will be preceded by pushed() from the first push. +### `doubleClick()` -The anteceding pushed() event can't be avoided, because to restrict the pushed() function to single clicks it would have to wait for a possible second click, which would introduce an annoying delay. So, the action on doubleClick() has to undo the previous action on pushed(). +It returns `true` if a push button is double clicked within `250ms` (by default). Note that a `doubleClick()` always will be preceded by `pushed()` from the first push. -#### singleClick() +The anteceding `pushed()` event can't be avoided, because to restrict the `pushed()` function to single clicks it would have to wait for a possible second click, which would introduce an annoying delay. So, the action on `doubleClick()` has to undo the previous action on `pushed()`. -It returns "true" if a push button is clicked once and the requirements for doubleClick and longPress are not met. The event thus occur several miliseconds after the actual push, because it depends on the other events not happening after the push. Use this if three different interactions are needed in combination with doubleClick and longPress. Note that a singleClick() always will be preceded by pushed(). Use pushed() instead if immediate response is required and there is no interest in monitoring doubleClick and longPress. +### `singleClick()` +It returns "true" if a push button is clicked once and the requirements for `doubleClick` and `longPress` are not met. The event thus occur several milliseconds after the actual push, because it depends on the other events not happening after the push. Use this if three different interactions are needed in combination with `doubleClick` and `longPress`. Note that a `singleClick()` always will be preceded by `pushed()`. Use `pushed()` instead if immediate response is required and there is no interest in monitoring `doubleClick` and longPress. -#### Example +## Examples See the example in the library for a complete working program. ### Transparent signal filtering -#### Deglitching -Sudden short changes in the microcontroler power supply may create inexistent switched() events if the pin is polled in that instant. Deglitching is achieved because the software will not believe that a voltage change has happened (a swithed event) until the voltage remains in the new level for a minimum period. A voltage change will be ignored if it returns to the original level before that period. +#### De-glitching +Sudden short changes in the microcontroller power supply may create inexistent switched() events if the pin is polled in that instant. De-glitching is achieved because the software will not believe that a voltage change has happened (a switched event) until the voltage remains in the new level for a minimum period. A voltage change will be ignored if it returns to the original level before that period. #### Debouncing -Due to the elastic properties of the metals in the contacts they bounce away from each other after the initial contact creating false switched() events after an initial true switch, until the voltage stabilizes in the new level. Debouncing forces a refractary period after an initial switch, during which any voltage level change is ignored. +Due to the elastic properties of the metals in the contacts they bounce away from each other after the initial contact creating false switched() events after an initial true switch, until the voltage stabilizes in the new level. Debouncing forces a refractory period after an initial switch, during which any voltage level change is ignored. ### Using callback functions to be triggered by button events @@ -87,7 +89,7 @@ Callbacks can be used, instead of needing to check with an `if` statement whethe With a callback registered, Switch will run the defined function when the conditions are met at the time `poll()` is called. Calling `poll()` periodically is the only requirement. -First, define a function with the action you want to perform, with no return type (void) and one argument, a pointer to some reference (or use nullptr if you don't need it.): +First, define a function with the action you want to perform, with no return type `(void)` and one argument, a pointer to some reference (or use `nullptr` if you don't need it.): ```C++ void foo(void* ref) { @@ -114,7 +116,7 @@ See the example in the library for a complete working program. ### Notes -The poll instruction must be called at least 50 times per second, i.e. every 20ms; it takes about 20us in Arduino. +The poll instruction must be called at least `50 times` per second, i.e. every `20ms`; it takes about 20us in Arduino. The button states are saved till the next poll. Then all previous button states will be cleared, so the button states must be read every poll interval, after calling the poll function. @@ -122,7 +124,7 @@ Reading a button several times within a poll interval gives the same value, so r ### SUGESTION: Using an interrupt service routine for polling the buttons -Polling buttons has a high priority and should be done often. Slow functions such as Serial.print() may disrupt the timing. +Polling buttons has a high priority and should be done often. Slow functions such as `Serial.print()` may disrupt the timing. Polling could be done in a function triggered by a timed interrupt. Remember to keep the subsequent button actions short as you would do with any code in interrupts. @@ -161,33 +163,33 @@ For ESP8266 use the [Ticker](https://arduino-esp8266.readthedocs.io/en/latest/li ### How to use successive button events -With the Switch library, you can use all button events at the same time with the same button. For example pushed(), released(), doubleClick() and longPress(). To see an example of what can be achieved with several button events in order to perform different functions, run Windows Explorer: a single click selects a file and a double click opens it. +With the Switch library, you can use all button events at the same time with the same button. For example `pushed()`, `released()`, `doubleClick()` and `longPress()`. To see an example of what can be achieved with several button events in order to perform different functions, run Windows Explorer: a single click selects a file and a double click opens it. -#### Button pushed event followed by a longPress event +#### Button pushed event followed by a `longPress` event -A long-press generates first a pushed event and after 300ms (by default) the longPress event. This is not a shortcoming but a logical consequence. We can, of course, not always wait 300ms to see if a push might be a long push. +A long-press generates first a pushed event and after `300ms` (by default) the `longPress` event. This is not a shortcoming but a logical consequence. We can, of course, not always wait `300ms` to see if a push might be a long push. -#### Button pushed event followed by a doubleClick event +#### Button pushed event followed by a `doubleClick` event -The same happens with doubleClick, which also generates two pushed() events. When doubleClick is used, ignore the second pushed() result or don't call pushed(). When doubleClick is not needed, simply don't call doubleClick(). +The same happens with `doubleClick`, which also generates two `pushed()` events. When `doubleClick` is used, ignore the second `pushed()` result or don't call `pushed()`. When `doubleClick` is not needed, simply don't call `doubleClick()`. -#### Combining singleClick, doubleClick, and longPress events +#### Combining `singleClick`, `doubleClick`, and `longPress` events -If these three events must be used toghether the best strategy is to stick to their get functions and avoid using pushed(). +If these three events must be used together the best strategy is to stick to their get functions and avoid using pushed(). ## Hardware considerations -#### Connecting switches to the microcontroler +### Connecting switches to the microcontroller There is nothing needed beyond the switches, just connect the switches between the ground and a digital pin. -#### Switch between GND and digital pin +### Switch between GND and digital pin This is technically speaking the best solution and it is taken by the library as default. An external pull-up resistor is not needed but allowed. -#### Switch between VCC(3.3V or 5V) and digital pin +### Switch between VCC(3.3V or 5V) and digital pin -For switches connected to the Arduino power supply, the settings are: polarity = HIGH and pinmode = INPUT, which disables the internal pull-up resistor. Note that we need external pull-down resistors of about 10k here. +For switches connected to the Arduino power supply, the settings are: `polarity = HIGH` and `pinmode = INPUT`, which disables the internal pull-up resistor. Note that we need external pull-down resistors of about 10k here. ## Questions @@ -197,21 +199,21 @@ Post issues on the github repository. ## Explanation of the inner working -### New: software deglitch +### New: software de-glitch -Normally, just debouncing is used. But debouncing doesn't make the software insensitive to noise pulses, which could lead to dangerous situations: if there is a poll() at the moment of a noise pulse, the software can detect an activated switch. To prevent this, a deglitch function is added now: during a "deglitchPeriod", all input values have to be equal. +Normally, just debouncing is used. But debouncing doesn't make the software insensitive to noise pulses, which could lead to dangerous situations: if there is a `poll()` at the moment of a noise pulse, the software can detect an activated switch. To prevent this, a de-glitch function is added now: during a `deglitchPeriod`, all input values have to be equal. ### Software debounce, how does it work -The software debounce algorithm is based on the following assumptions; the 50ms (by default) is the so-called debounce period: +The software debounce algorithm is based on the following assumptions; the `50ms` (by default) is the so-called debounce period: -- The switch bounce time is less than 50ms. -- The time between successive keystrokes is larger than 50ms. -- A reaction time of 50ms is acceptable. +- The switch bounce time is less than `50ms`. +- The time between successive keystrokes is larger than `50ms`. +- A reaction time of `50ms` is acceptable. If the above assumptions are met, the software debounce algorithm can be quite simple: a switch event is only accepted when the elapsed time since the last switch event is larger than the debounce period. -A debounce period of 50ms is a safe value; it doesn't hurt the reaction time, and will handle even bad switches. +A debounce period of `50ms` is a safe value; it doesn't hurt the reaction time, and will handle even bad switches. See the following pseudocode: @@ -222,7 +224,7 @@ if((current_deglitched != previous_debounced) & ((current_ms - last_switchedTime ### Overall functioning -Several discrete signals (updated at poll times) are created. The raw signal is deglitched, the later debounced, and that one in turn is processed to generate a signal for each one of the events. +Several discrete signals (updated at poll times) are created. The raw signal is de-glitched, the later debounced, and that one in turn is processed to generate a signal for each one of the events. ### Timing diagram @@ -316,20 +318,26 @@ Several discrete signals (updated at poll times) are created. The raw signal is ### Additional information See also: [A Guide To Debouncing](http://www.eng.utah.edu/~cs5780/debouncing.pdf) +### Developer Note -### Licenses -#### Library +Please perform formatting before committing the code. -[![GNU License](https://www.gnu.org/graphics/gplv3-88x31.png)](https://www.gnu.org/licenses/gpl-3.0.en.html) +```sh +clang-format -i src/*.* examples/**/*.ino +``` -Copyright (C) 2012 Albert van Dalen +## License -http://www.avdweb.nl +`SPDX: GPL-3.0-or-later` -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. -#### Documents +`Switch` - Arduino switch and button library with Short/Long Press, Double Click and Beep. + +Copyright (C) 2012-2024 Albert van Dalen -[![bt-nc-sa](http://i.creativecommons.org/l/by-nc-sa/3.0/88x31.png)](http://creativecommons.org/licenses/by-nc-sa/3.0/) +Copyright (C) 2024 Abhijit Bose (aka. Boseji) :contributor: + +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 document is licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/). +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 . diff --git a/avdweb_Switch.cpp b/avdweb_Switch.cpp deleted file mode 100644 index 36a5acc..0000000 --- a/avdweb_Switch.cpp +++ /dev/null @@ -1,278 +0,0 @@ -/* -Switch.cpp -Copyright (C) 2012 Albert van Dalen http://www.avdweb.nl -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 at http://www.gnu.org/licenses . - -AUTHOR: Albert van Dalen -WEBSITE: http://www.avdweb.nl/arduino/hardware-interfacing/simple-switch-debouncer.html - -HISTORY: -1.0.0 20-04-2013 _debouncePeriod=50 -1.0.1 22-05-2013 Added longPress, doubleClick -1.0.2 01-12-2015 added process(input) -1.0.3 15-01-2016 added deglitching -1.0.5 25-01-2017 file renamed to avdweb_Switch -1.1.0 28-07-2018 added callbacks (code by Sean Lanigan, added by Martin Laclaustra) -1.2.0-rc 28-07-2018 added singleclick. Reorganize, keeping variables for each event in one function -1.2.0 29-09-2018 released -1.2.1 30-11-2018 bugfix. Initialize time variables in the constructor. Fixes false event if first call to poll was delayed -1.2.2 18-10-2019 beep when a switch is pressed with using a setBeepAllCallback function -1.2.3 03-04-2020 made public: deglitchPeriod, debouncePeriod, longPressPeriod, doubleClickPeriod -1.2.4 14-07-2021 "static switchCallback_t _beepAllCallback = nullptr;" gives error with SAMD21, removed "= nullptr;" - -..........................................DEGLITCHING.............................. - - ________________ _ - on | | | | _ - | | | | | | - | |_| |___| |__ - analog off_____|_____________________________|____________________________ - - ________________ _ _ - input _____| |_| |___| |_______________________________ - - poll ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ - - equal 0 1 1 0 1 1 1 1 1 1 1 1 0 0 0 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - - deglitchPeriod <--------><-- <-- <- <--------><--------><-------- - ___________________________ - deglitched _________________| |__________________ - - deglitchTime ^ ^ ^ ^ ^ ^ ^ - - ..........................................DEBOUNCING............................. - - debouncePeriod <--------------------------------> - _________________________________ - debounced _________________| |____________ - _ _ - _switched _________________| |_______________________________| |__________ - - switchedTime ^ ^ - - -********************************************************************************** -........................................DOUBLE CLICK.............................. - - __________ ______ - debounced ________| |_______| |_____________________________ - - poll ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ - _ _ - pushed _________| |________________| |__________________________________ - - pushedTime ^ ^ - _ _ - released ____________________| |____________| |___________________________ - - releasedTime ^ ^ - - doubleClickPeriod <-------------------------------------> - _ - _doubleClick ___________________________| |__________________________________ - - -........................................LONG PRESS................................ - - ___________________________ - debounced ________| |___________________________ - - poll ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ - - longPressPeriod <---------------> - _ _ - _switched _________| |_________________________| |________________________ - __________ - longPressDisable ___________________________| |_________________________ - _ - _longPress ___________________________| |__________________________________ - - -........................................SINGLE CLICK.............................. - - __________ ______ - debounced ________| |_______________________________| |_____ - - poll ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ - - longPressPeriod <---------------> - doubleClickPeriod <-------------------------------------> - _ _ _ _ - _switched _________| |_______| |_____________________________| |____| |___ - _____ - singleClickDisable______________________________________________| |__________ - _ - _singleClick _______________________________________________| |______________ - -*/ - -#include "Arduino.h" -#include "avdweb_Switch.h" - -switchCallback_t Switch::_beepAllCallback = nullptr; // definition static function pointer with typedef -void* Switch::_beepAllCallbackParam = nullptr; - -Switch::Switch(byte _pin, byte PinMode, bool polarity, unsigned long debouncePeriod, unsigned long longPressPeriod, unsigned long doubleClickPeriod, unsigned long deglitchPeriod): -deglitchPeriod(deglitchPeriod), debouncePeriod(debouncePeriod), longPressPeriod(longPressPeriod), doubleClickPeriod(doubleClickPeriod), pin(_pin), polarity(polarity) -{ pinMode(pin, PinMode); - switchedTime = millis(); - debounced = digitalRead(pin); - singleClickDisable = true; - poll(); -} - -bool Switch::poll() -{ input = digitalRead(pin); - ms = millis(); - return process(); -} - -bool Switch::process() -{ deglitch(); - debounce(); - calcSingleClick(); - calcDoubleClick(); - calcLongPress(); - if(switched()) - { switchedTime = ms; //stores last times for future rounds - if(pushed()) - { if(_beepAllCallback) _beepAllCallback(_beepAllCallbackParam); - pushedTime = ms; - } else { releasedTime = ms; - } - } - triggerCallbacks(); - return _switched; -} - -void inline Switch::deglitch() -{ if(input == lastInput) equal = 1; - else - { equal = 0; - deglitchTime = ms; - } - if(equal && ((ms - deglitchTime) > deglitchPeriod)) // max 50ms, disable deglitch: 0ms - { deglitched = input; - deglitchTime = ms; - } - lastInput = input; -} - -void inline Switch::debounce() -{ _switched = 0; - if((deglitched != debounced) && ((ms - switchedTime) > debouncePeriod)) - { debounced = deglitched; - _switched = 1; - } -} - -void inline Switch::calcSingleClick() -{ _singleClick = false; - if(pushed()) - { if((ms - pushedTime) >= doubleClickPeriod) - { singleClickDisable = false; //resets when pushed not in second click of doubleclick - } else { singleClickDisable = true; //silence single click in second cl. doublecl. - } - } - if(!singleClickDisable) - { _singleClick = !switched() && !on() && ((releasedTime - pushedTime) <= longPressPeriod) && ((ms - pushedTime) >= doubleClickPeriod); // true just one time between polls - singleClickDisable = _singleClick; // will be reset at next push - } -} - -void inline Switch::calcDoubleClick() -{ _doubleClick = pushed() && ((ms - pushedTime) < doubleClickPeriod); -} - -void inline Switch::calcLongPress() -{ _longPress = false; - if(released()) longPressDisable = false; //resets when released - if(!longPressDisable) - { _longPress = !switched() && on() && ((ms - pushedTime) > longPressPeriod); // true just one time between polls - longPressDisable = _longPress; // will be reset at next release - } -} - -bool Switch::switched() -{ return _switched; -} - -bool Switch::on() -{ return !(debounced^polarity); -} - -bool Switch::pushed() -{ return _switched && !(debounced^polarity); -} - -bool Switch::released() -{ return _switched && (debounced^polarity); -} - -bool Switch::longPress() -{ return _longPress; -} - -bool Switch::doubleClick() -{ return _doubleClick; -} - -bool Switch::singleClick() -{ return _singleClick; -} - -void Switch::triggerCallbacks() -{ if(_pushedCallback && pushed()) - { _pushedCallback(_pushedCallbackParam); - } - else if(_releasedCallback && released()) - { _releasedCallback(_releasedCallbackParam); - } - - if(_longPressCallback && longPress()) - { _longPressCallback(_longPressCallbackParam); - } - - if(_doubleClickCallback && doubleClick()) - { _doubleClickCallback(_doubleClickCallbackParam); - } - - if(_singleClickCallback && singleClick()) - { _singleClickCallback(_singleClickCallbackParam); - } -} - -void Switch::setPushedCallback(switchCallback_t cb, void* param) -{ _pushedCallback = cb; // Store the "pushed" callback function - _pushedCallbackParam = param; -} - -void Switch::setReleasedCallback(switchCallback_t cb, void* param) -{ _releasedCallback = cb; // Store the "released" callback function - _releasedCallbackParam = param; -} - -void Switch::setLongPressCallback(switchCallback_t cb, void* param) -{ _longPressCallback = cb; // Store the "long press" callback function - _longPressCallbackParam = param; -} - -void Switch::setDoubleClickCallback(switchCallback_t cb, void* param) -{ _doubleClickCallback = cb; // Store the "double click" callback function - _doubleClickCallbackParam = param; -} - -void Switch::setSingleClickCallback(switchCallback_t cb, void* param) -{ _singleClickCallback = cb; // Store the "double click" callback function - _singleClickCallbackParam = param; -} - -//void Switch::setBeepAllCallback(void(*cb)(void*), void* param) static function pointer without typedef -void Switch::setBeepAllCallback(switchCallback_t cb, void* param) // with static function pointer without typedef -{ _beepAllCallback = cb; // Store the "beep" callback function - _beepAllCallbackParam = param; -} diff --git a/avdweb_Switch.h b/avdweb_Switch.h deleted file mode 100644 index ce51ac9..0000000 --- a/avdweb_Switch.h +++ /dev/null @@ -1,73 +0,0 @@ -/* -Switch.cpp -Copyright (C) 2012 Albert van Dalen http://www.avdweb.nl -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 at http://www.gnu.org/licenses . - -AUTHOR: Albert van Dalen -WEBSITE: http://www.avdweb.nl/arduino/hardware-interfacing/simple-switch-debouncer.html -*/ - -#ifndef AVDWEB_SWITCH_H -#define AVDWEB_SWITCH_H - -typedef void (*switchCallback_t)(void*); - -class Switch -{ -public: - Switch(byte _pin, byte PinMode=INPUT_PULLUP, bool polarity=LOW, unsigned long debouncePeriod=50, unsigned long longPressPeriod=300, unsigned long doubleClickPeriod=250, unsigned long deglitchPeriod=10); - bool poll(); // Returns 1 if switched - bool switched(); // will be refreshed by poll() - bool on(); - bool pushed(); // will be refreshed by poll() - bool released(); // will be refreshed by poll() - bool longPress(); // will be refreshed by poll() - bool doubleClick(); // will be refreshed by poll() - bool singleClick(); // will be refreshed by poll() - - // Set methods for event callbacks - void setPushedCallback(switchCallback_t cb, void* param = nullptr); - void setReleasedCallback(switchCallback_t cb, void* param = nullptr); - void setLongPressCallback(switchCallback_t cb, void* param = nullptr); - void setDoubleClickCallback(switchCallback_t cb, void* param = nullptr); - void setSingleClickCallback(switchCallback_t cb, void* param = nullptr); - void setBeepAllCallback(switchCallback_t cb, void* param = nullptr); - - unsigned long deglitchPeriod, debouncePeriod, longPressPeriod, doubleClickPeriod; - - protected: - bool process(); // not inline, used in child class - void inline deglitch(); - void inline debounce(); - void inline calcLongPress(); - void inline calcDoubleClick(); - void inline calcSingleClick(); - void triggerCallbacks(); - - unsigned long deglitchTime, switchedTime, pushedTime, releasedTime, ms; - const byte pin; - const bool polarity; - bool input, lastInput, equal, deglitched, debounced, _switched, _longPress, longPressDisable, _doubleClick, _singleClick, singleClickDisable; - - // Event callbacks - switchCallback_t _pushedCallback = nullptr; - switchCallback_t _releasedCallback = nullptr; - switchCallback_t _longPressCallback = nullptr; - switchCallback_t _doubleClickCallback = nullptr; - switchCallback_t _singleClickCallback = nullptr; - static switchCallback_t _beepAllCallback; // static function pointer, can be used by all objects - //static switchCallback_t _beepAllCallback = nullptr; // gives error with SAMD21 - //static void(*_beepAllCallback)(void*) = nullptr; // static function pointer without typedef - - void* _pushedCallbackParam = nullptr; - void* _releasedCallbackParam = nullptr; - void* _longPressCallbackParam = nullptr; - void* _doubleClickCallbackParam = nullptr; - void* _singleClickCallbackParam = nullptr; - static void* _beepAllCallbackParam; // can be used by all objects - //static void* _beepAllCallbackParam = nullptr; // gives error with SAMD21 -}; -#endif diff --git a/examples/SwitchCallbackExample/SwitchCallbackExample.ino b/examples/SwitchCallbackExample/SwitchCallbackExample.ino index 9f891c6..b90c83b 100644 --- a/examples/SwitchCallbackExample/SwitchCallbackExample.ino +++ b/examples/SwitchCallbackExample/SwitchCallbackExample.ino @@ -1,4 +1,3 @@ -#include "Arduino.h" #include "avdweb_Switch.h" const byte toggleSwitchpin = 10; @@ -7,29 +6,31 @@ const byte multiresponseButtonpin = 9; Switch toggleSwitch = Switch(toggleSwitchpin); Switch multiresponseButton = Switch(multiresponseButtonpin); -void buttonCallbackFunction(void* s) { +void buttonCallbackFunction(void *s) { Serial.print("Button: "); - Serial.println((char*)s); + Serial.println((char *)s); } -void toggleCallbackFunction(void* s) { +void toggleCallbackFunction(void *s) { Serial.print("Toggle: "); - Serial.println((char*)s); + Serial.println((char *)s); } -void setup() -{ +void setup() { Serial.begin(9600); - toggleSwitch.setPushedCallback(&toggleCallbackFunction, (void*)"turned on"); - toggleSwitch.setReleasedCallback(&toggleCallbackFunction, (void*)"turned off"); + toggleSwitch.setPushedCallback(&toggleCallbackFunction, (void *)"turned on"); + toggleSwitch.setReleasedCallback(&toggleCallbackFunction, + (void *)"turned off"); - multiresponseButton.setLongPressCallback(&buttonCallbackFunction, (void*)"long press"); - multiresponseButton.setDoubleClickCallback(&buttonCallbackFunction, (void*)"double click"); - multiresponseButton.setSingleClickCallback(&buttonCallbackFunction, (void*)"single click"); + multiresponseButton.setLongPressCallback(&buttonCallbackFunction, + (void *)"long press"); + multiresponseButton.setDoubleClickCallback(&buttonCallbackFunction, + (void *)"double click"); + multiresponseButton.setSingleClickCallback(&buttonCallbackFunction, + (void *)"single click"); } -void loop() -{ +void loop() { toggleSwitch.poll(); multiresponseButton.poll(); } diff --git a/examples/SwitchExample/SwitchExample.ino b/examples/SwitchExample/SwitchExample.ino index e82e155..10c8020 100644 --- a/examples/SwitchExample/SwitchExample.ino +++ b/examples/SwitchExample/SwitchExample.ino @@ -1,54 +1,81 @@ -#include "Arduino.h" -#include "avdweb_Switch.h" +#include "avdweb_Switch.h" -const byte pushButtonpin = 10; // downButton -const byte toggleSwitchpin = 9; // upButton +const byte pushButtonpin = 10; // downButton +const byte toggleSwitchpin = 9; // upButton const byte multiresponseButtonpin = 4; // selectButton -const byte alleventsButtonpin = 7; // weldButton -const byte buzzerPin = 3; // for beep when a switch is pressed +const byte alleventsButtonpin = 7; // weldButton +const byte buzzerPin = 3; // for beep when a switch is pressed int i; -Switch pushButton = Switch(pushButtonpin); // button to GND, use internal 20K pullup resistor +Switch pushButton = + Switch(pushButtonpin); // button to GND, use internal 20K pullup resistor Switch toggleSwitch = Switch(toggleSwitchpin); Switch multiresponseButton = Switch(multiresponseButtonpin); Switch alleventsButton = Switch(alleventsButtonpin); // Other examples of constructors -// Switch pushButtonVCC = Switch(pushButtonpin, INPUT, HIGH); // button to VCC, 10k pull-down resistor, no internal pull-up resistor, HIGH polarity -// Switch pushButton1ms = Switch(pushButtonpin, INPUT_PULLUP, LOW, 1); // debounceTime 1ms +// Switch pushButtonVCC = Switch(pushButtonpin, INPUT, HIGH); // button to VCC, +// 10k pull-down resistor, no internal pull-up resistor, HIGH polarity Switch +// pushButton1ms = Switch(pushButtonpin, INPUT_PULLUP, LOW, 1); // debounceTime +// 1ms -void beepCallbackFunction(void* s) // optional -{ tone(3, 2400, 5); // is non-blocking - //Serial.print("BeepCallback: "); Serial.println((char*)s); +void beepCallbackFunction(void *s) // optional +{ + tone(3, 2400, 5); // is non-blocking + // Serial.print("BeepCallback: "); Serial.println((char*)s); } -void setup() -{ Serial.begin(115200); - toggleSwitch.setBeepAllCallback(&beepCallbackFunction/*, "Beep done"*/); // needed only for one switch because of static +void setup() { + Serial.begin(115200); + toggleSwitch.setBeepAllCallback( + &beepCallbackFunction /*, "Beep done"*/); // needed only for one switch + // because of static // multiresponseButton.doubleClickPeriod=0; disable doubleClick() } -void loop() -{ // pushButton simple events +void loop() { // pushButton simple events pushButton.poll(); - if(pushButton.switched()) Serial.print("pushButton switched "); - if(pushButton.pushed()) {Serial.print("pushButton pushed "); Serial.print(++i); Serial.println(" times");} - if(pushButton.released()) Serial.println("pushButton released"); + if (pushButton.switched()) + Serial.print("pushButton switched "); + if (pushButton.pushed()) { + Serial.print("pushButton pushed "); + Serial.print(++i); + Serial.println(" times"); + } + if (pushButton.released()) + Serial.println("pushButton released"); // toggleSwitch report status only when changed - if(toggleSwitch.poll()) {Serial.print("toggleSwitch status changed to "); Serial.println(toggleSwitch.on());} + if (toggleSwitch.poll()) { + Serial.print("toggleSwitch status changed to "); + Serial.println(toggleSwitch.on()); + } // multiresponseButton complex events multiresponseButton.poll(); - if(multiresponseButton.longPress()) Serial.println("multiresponseButton longPress"); - if(multiresponseButton.doubleClick()) Serial.println("multiresponseButton doubleClick"); - if(multiresponseButton.singleClick()) Serial.println("multiresponseButton singleClick"); + if (multiresponseButton.longPress()) + Serial.println("multiresponseButton longPress"); + if (multiresponseButton.doubleClick()) + Serial.println("multiresponseButton doubleClick"); + if (multiresponseButton.singleClick()) + Serial.println("multiresponseButton singleClick"); // alleventsButton complex events alleventsButton.poll(); - if(alleventsButton.switched()) {Serial.println("all_e_B switched."); Serial.print(" all_e_B status to "); Serial.print(alleventsButton.on()); Serial.println(".");} - if(alleventsButton.pushed()) {Serial.println(" all_e_B pushed.");} - if(alleventsButton.released()) Serial.println(" all_e_B released."); - if(alleventsButton.longPress()) Serial.println(" ==> all_e_B longPress."); - if(alleventsButton.doubleClick()) Serial.println(" ==> all_e_B doubleClick."); - if(alleventsButton.singleClick()) Serial.println(" ==> all_e_B singleClick."); + if (alleventsButton.switched()) { + Serial.println("all_e_B switched."); + Serial.print(" all_e_B status to "); + Serial.print(alleventsButton.on()); + Serial.println("."); + } + if (alleventsButton.pushed()) { + Serial.println(" all_e_B pushed."); + } + if (alleventsButton.released()) + Serial.println(" all_e_B released."); + if (alleventsButton.longPress()) + Serial.println(" ==> all_e_B longPress."); + if (alleventsButton.doubleClick()) + Serial.println(" ==> all_e_B doubleClick."); + if (alleventsButton.singleClick()) + Serial.println(" ==> all_e_B singleClick."); } diff --git a/keywords.txt b/keywords.txt index 74cd933..9b65f44 100644 --- a/keywords.txt +++ b/keywords.txt @@ -7,6 +7,7 @@ ####################################### Switch KEYWORD1 +avdweb_Switch.h KEYWORD1 ####################################### # Methods and Functions (KEYWORD2) @@ -33,4 +34,4 @@ setSingleClickCallback KEYWORD2 ####################################### # Constants (LITERAL1) ####################################### - + diff --git a/library.properties b/library.properties index 910c089..3b127cb 100644 --- a/library.properties +++ b/library.properties @@ -1,10 +1,11 @@ -name=Switch +name=avdweb_Switch version=1.2.4 -author=Albert van Dalen -maintainer=Albert van Dalen +author=Albert van Dalen +license=GPL-3.0-or-later +maintainer=Abhijit Bose (aka. Boseji) sentence=Arduino library for deglitching and debouncing switches and buttons. paragraph=Supports detecting longPress, doubleClick, and singleClick. Supports defining callback functions. category=Signal Input/Output url=https://github.com/avandalen/avdweb_Switch architectures=avr, samd, esp8266, esp32, megaavr -license=GPL-3.0+ +includes=avdweb_Switch.h diff --git a/src/avdweb_Switch.cpp b/src/avdweb_Switch.cpp new file mode 100644 index 0000000..8084309 --- /dev/null +++ b/src/avdweb_Switch.cpp @@ -0,0 +1,321 @@ +/** + * avdweb_Switch.cpp + * + * Switch - Arduino switch and button library with Short/Long Press, + * Double Click and Beep. + * =========================================================== + * + * Sources + * ------- + * https://github.com/avandalen/avdweb_Switch + * + * Website + * ------- + * http://www.avdweb.nl/arduino/hardware-interfacing/simple-switch-debouncer.html + * + * License + * -------- + * SPDX: GPL-3.0-or-later + * + * Switch - Arduino switch and button library with Short/Long Press, + * Double Click and Beep. + * Copyright (C) 2012-2024 Albert van Dalen + * Copyright (C) 2024 Abhijit Bose (aka. Boseji) :contributor: + * + * 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 . + * + * Notes + * ------ + * + * HISTORY: + * 1.0.0 20-04-2013 _debouncePeriod=50 + * 1.0.1 22-05-2013 Added longPress, doubleClick + * 1.0.2 01-12-2015 added process(input) + * 1.0.3 15-01-2016 added deglitching + * 1.0.5 25-01-2017 file renamed to avdweb_Switch + * 1.1.0 28-07-2018 added callbacks (code by Sean Lanigan, added by + * Martin Laclaustra) + * 1.2.0-rc 28-07-2018 added singleclick. Reorganize, keeping + * variables for each event in one function + * 1.2.0 29-09-2018 released + * 1.2.1 30-11-2018 bugfix. Initialize time variables in the constructor. + * Fixes false event if first call to poll was delayed + * 1.2.2 18-10-2019 beep when a switch is pressed with using a + * setBeepAllCallback function + * 1.2.3 03-04-2020 made public: deglitchPeriod, debouncePeriod, + * longPressPeriod, doubleClickPeriod + * 1.2.4 14-07-2021 "static switchCallback_t _beepAllCallback = nullptr;" + * gives error with SAMD21, removed "= nullptr;" + * + ******************************************************************************* +.......................................DEGLITCHING.............................. + + ________________ _ + on | | | | _ + | | | | | | + | |_| |___| |__ + analog off_____|_____________________________|____________________________ + + ________________ _ _ + input _____| |_| |___| |_______________________________ + + poll ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ + + equal 0 1 1 0 1 1 1 1 1 1 1 1 0 0 0 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 + + deglitchPeriod <--------><-- <-- <- <--------><--------><-------- + ___________________________ + deglitched _________________| |__________________ + + deglitchTime ^ ^ ^ ^ ^ ^ ^ + + ........................................DEBOUNCING............................. + + debouncePeriod <--------------------------------> + _________________________________ + debounced _________________| |____________ + _ _ + _switched _________________| |_______________________________| |__________ + + switchedTime ^ ^ + + +******************************************************************************** +......................................DOUBLE CLICK.............................. + + __________ ______ + debounced ________| |_______| |_____________________________ + + poll ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ + _ _ + pushed _________| |________________| |__________________________________ + + pushedTime ^ ^ + _ _ + released ____________________| |____________| |___________________________ + + releasedTime ^ ^ + + doubleClickPeriod <-------------------------------------> + _ + _doubleClick ___________________________| |__________________________________ + + +......................................LONG PRESS................................ + + ___________________________ + debounced ________| |___________________________ + + poll ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ + + longPressPeriod <---------------> + _ _ + _switched _________| |_________________________| |________________________ + __________ + longPressDisable__________________________| |_________________________ + _ + _longPress ___________________________| |__________________________________ + + +......................................SINGLE CLICK.............................. + + __________ ______ + debounced ________| |_______________________________| |_____ + + poll ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ + + longPressPeriod <---------------> + doubleClickPeriod <-------------------------------------> + _ _ _ _ + _switched _________| |_______| |_____________________________| |____| |___ + _____ + singleClickDisable____________________________________________| |__________ + _ + _singleClick _______________________________________________| |______________ + + ******************************************************************************* + */ + +#include "avdweb_Switch.h" + +switchCallback_t Switch::_beepAllCallback = + nullptr; // definition static function pointer with typedef +void *Switch::_beepAllCallbackParam = nullptr; + +Switch::Switch(byte _pin, byte PinMode, bool polarity, + unsigned long debouncePeriod, unsigned long longPressPeriod, + unsigned long doubleClickPeriod, unsigned long deglitchPeriod) + : deglitchPeriod(deglitchPeriod), debouncePeriod(debouncePeriod), + longPressPeriod(longPressPeriod), doubleClickPeriod(doubleClickPeriod), + pin(_pin), polarity(polarity) { + pinMode(pin, PinMode); + switchedTime = millis(); + debounced = digitalRead(pin); + singleClickDisable = true; + poll(); +} + +bool Switch::poll() { + input = digitalRead(pin); + ms = millis(); + return process(); +} + +bool Switch::process() { + deglitch(); + debounce(); + calcSingleClick(); + calcDoubleClick(); + calcLongPress(); + if (switched()) { + switchedTime = ms; // stores last times for future rounds + if (pushed()) { + if (_beepAllCallback) + _beepAllCallback(_beepAllCallbackParam); + pushedTime = ms; + } else { + releasedTime = ms; + } + } + triggerCallbacks(); + return _switched; +} + +void inline Switch::deglitch() { + if (input == lastInput) + equal = 1; + else { + equal = 0; + deglitchTime = ms; + } + if (equal && + ((ms - deglitchTime) > deglitchPeriod)) // max 50ms, disable deglitch: 0ms + { + deglitched = input; + deglitchTime = ms; + } + lastInput = input; +} + +void inline Switch::debounce() { + _switched = 0; + if ((deglitched != debounced) && ((ms - switchedTime) > debouncePeriod)) { + debounced = deglitched; + _switched = 1; + } +} + +void inline Switch::calcSingleClick() { + _singleClick = false; + if (pushed()) { + if ((ms - pushedTime) >= doubleClickPeriod) { + singleClickDisable = + false; // resets when pushed not in second click of doubleclick + } else { + singleClickDisable = true; // silence single click in second cl. doublecl. + } + } + if (!singleClickDisable) { + _singleClick = !switched() && !on() && + ((releasedTime - pushedTime) <= longPressPeriod) && + ((ms - pushedTime) >= + doubleClickPeriod); // true just one time between polls + singleClickDisable = _singleClick; // will be reset at next push + } +} + +void inline Switch::calcDoubleClick() { + _doubleClick = pushed() && ((ms - pushedTime) < doubleClickPeriod); +} + +void inline Switch::calcLongPress() { + _longPress = false; + if (released()) + longPressDisable = false; // resets when released + if (!longPressDisable) { + _longPress = !switched() && on() && + ((ms - pushedTime) > + longPressPeriod); // true just one time between polls + longPressDisable = _longPress; // will be reset at next release + } +} + +bool Switch::switched() { return _switched; } + +bool Switch::on() { return !(debounced ^ polarity); } + +bool Switch::pushed() { return _switched && !(debounced ^ polarity); } + +bool Switch::released() { return _switched && (debounced ^ polarity); } + +bool Switch::longPress() { return _longPress; } + +bool Switch::doubleClick() { return _doubleClick; } + +bool Switch::singleClick() { return _singleClick; } + +void Switch::triggerCallbacks() { + if (_pushedCallback && pushed()) { + _pushedCallback(_pushedCallbackParam); + } else if (_releasedCallback && released()) { + _releasedCallback(_releasedCallbackParam); + } + + if (_longPressCallback && longPress()) { + _longPressCallback(_longPressCallbackParam); + } + + if (_doubleClickCallback && doubleClick()) { + _doubleClickCallback(_doubleClickCallbackParam); + } + + if (_singleClickCallback && singleClick()) { + _singleClickCallback(_singleClickCallbackParam); + } +} + +void Switch::setPushedCallback(switchCallback_t cb, void *param) { + _pushedCallback = cb; // Store the "pushed" callback function + _pushedCallbackParam = param; +} + +void Switch::setReleasedCallback(switchCallback_t cb, void *param) { + _releasedCallback = cb; // Store the "released" callback function + _releasedCallbackParam = param; +} + +void Switch::setLongPressCallback(switchCallback_t cb, void *param) { + _longPressCallback = cb; // Store the "long press" callback function + _longPressCallbackParam = param; +} + +void Switch::setDoubleClickCallback(switchCallback_t cb, void *param) { + _doubleClickCallback = cb; // Store the "double click" callback function + _doubleClickCallbackParam = param; +} + +void Switch::setSingleClickCallback(switchCallback_t cb, void *param) { + _singleClickCallback = cb; // Store the "double click" callback function + _singleClickCallbackParam = param; +} + +// void Switch::setBeepAllCallback(void(*cb)(void*), void* param) static +// function pointer without typedef +void Switch::setBeepAllCallback( + switchCallback_t cb, + void *param) // with static function pointer without typedef +{ + _beepAllCallback = cb; // Store the "beep" callback function + _beepAllCallbackParam = param; +} diff --git a/src/avdweb_Switch.h b/src/avdweb_Switch.h new file mode 100644 index 0000000..e4b002c --- /dev/null +++ b/src/avdweb_Switch.h @@ -0,0 +1,107 @@ +/** + * avdweb_Switch.h + * + * Switch - Arduino switch and button library with Short/Long Press, + * Double Click and Beep. + * =========================================================== + * + * Sources + * ------- + * https://github.com/avandalen/avdweb_Switch + * + * Website + * ------- + * http://www.avdweb.nl/arduino/hardware-interfacing/simple-switch-debouncer.html + * + * License + * -------- + * SPDX: GPL-3.0-or-later + * + * Switch - Arduino switch and button library with Short/Long Press, + * Double Click and Beep. + * Copyright (C) 2012-2024 Albert van Dalen + * Copyright (C) 2024 Abhijit Bose (aka. Boseji) :contributor: + * + * 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 . + */ + +#ifndef AVDWEB_SWITCH_H +#define AVDWEB_SWITCH_H + +#include + +typedef void (*switchCallback_t)(void *); + +class Switch { +public: + Switch(byte _pin, byte PinMode = INPUT_PULLUP, bool polarity = LOW, + unsigned long debouncePeriod = 50, unsigned long longPressPeriod = 300, + unsigned long doubleClickPeriod = 250, + unsigned long deglitchPeriod = 10); + bool poll(); // Returns 1 if switched + bool switched(); // will be refreshed by poll() + bool on(); + bool pushed(); // will be refreshed by poll() + bool released(); // will be refreshed by poll() + bool longPress(); // will be refreshed by poll() + bool doubleClick(); // will be refreshed by poll() + bool singleClick(); // will be refreshed by poll() + + // Set methods for event callbacks + void setPushedCallback(switchCallback_t cb, void *param = nullptr); + void setReleasedCallback(switchCallback_t cb, void *param = nullptr); + void setLongPressCallback(switchCallback_t cb, void *param = nullptr); + void setDoubleClickCallback(switchCallback_t cb, void *param = nullptr); + void setSingleClickCallback(switchCallback_t cb, void *param = nullptr); + void setBeepAllCallback(switchCallback_t cb, void *param = nullptr); + + unsigned long deglitchPeriod, debouncePeriod, longPressPeriod, + doubleClickPeriod; + +protected: + bool process(); // not inline, used in child class + void inline deglitch(); + void inline debounce(); + void inline calcLongPress(); + void inline calcDoubleClick(); + void inline calcSingleClick(); + void triggerCallbacks(); + + unsigned long deglitchTime, switchedTime, pushedTime, releasedTime, ms; + const byte pin; + const bool polarity; + bool input, lastInput, equal, deglitched, debounced, _switched, _longPress, + longPressDisable, _doubleClick, _singleClick, singleClickDisable; + + // Event callbacks + switchCallback_t _pushedCallback = nullptr; + switchCallback_t _releasedCallback = nullptr; + switchCallback_t _longPressCallback = nullptr; + switchCallback_t _doubleClickCallback = nullptr; + switchCallback_t _singleClickCallback = nullptr; + static switchCallback_t + _beepAllCallback; // static function pointer, can be used by all objects + // static switchCallback_t _beepAllCallback = nullptr; // gives error with + // SAMD21 static void(*_beepAllCallback)(void*) = nullptr; // static function + // pointer without typedef + + void *_pushedCallbackParam = nullptr; + void *_releasedCallbackParam = nullptr; + void *_longPressCallbackParam = nullptr; + void *_doubleClickCallbackParam = nullptr; + void *_singleClickCallbackParam = nullptr; + static void *_beepAllCallbackParam; // can be used by all objects + // static void* _beepAllCallbackParam = nullptr; // gives error with SAMD21 +}; +#endif From ab6e8f11d90c91f6dae674cfdb0acd8d67fd47b7 Mon Sep 17 00:00:00 2001 From: boseji Date: Thu, 15 Aug 2024 22:01:15 +0530 Subject: [PATCH 2/2] Adding multiple Architecture compatibility and version upgrade --- library.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library.properties b/library.properties index 3b127cb..55a4781 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=avdweb_Switch -version=1.2.4 +version=1.2.5 author=Albert van Dalen license=GPL-3.0-or-later maintainer=Abhijit Bose (aka. Boseji) @@ -7,5 +7,5 @@ sentence=Arduino library for deglitching and debouncing switches and buttons. paragraph=Supports detecting longPress, doubleClick, and singleClick. Supports defining callback functions. category=Signal Input/Output url=https://github.com/avandalen/avdweb_Switch -architectures=avr, samd, esp8266, esp32, megaavr +architectures=* includes=avdweb_Switch.h