From 1ead66520bcd588f8d394b1ec5123b065ca3df3b Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Thu, 21 Aug 2025 23:11:42 +0200 Subject: [PATCH] add new ClockScreenSaver Signed-off-by: Peter Siegmund --- .../Dockerfile | 0 .../devcontainer.json | 0 .github/workflows/esp32_build.yml | 3 +- .gitignore | 22 + {firmware/.vscode => .vscode}/launch.json | 0 LICENSE | 661 ++++++++++++++++++ firmware/components/insa/CMakeLists.txt | 1 + .../insa/include/ui/ClockScreenSaver.h | 69 ++ .../insa/src/ui/ClockScreenSaver.cpp | 122 ++++ firmware/components/insa/src/ui/LightMenu.cpp | 19 +- .../components/led-manager/CMakeLists.txt | 1 + .../led-manager/include/led_status.h | 3 + .../led-manager/src/hal_esp32/led_manager.cpp | 6 +- .../led-manager/src/hal_esp32/led_status.cpp | 7 + .../led-manager/src/hal_native/led_status.cpp | 7 + firmware/config.dat | Bin 53 -> 0 bytes firmware/main/CMakeLists.txt | 1 - firmware/main/Kconfig.projbuild | 9 +- firmware/main/app_task.cpp | 3 +- firmware/main/button_handling.c | 4 +- firmware/partitions.csv | 5 +- firmware/sdkconfig.defaults | 13 +- firmware/src/ui/Device.cpp | 23 +- 23 files changed, 939 insertions(+), 40 deletions(-) rename {firmware/.devcontainer => .devcontainer}/Dockerfile (100%) rename {firmware/.devcontainer => .devcontainer}/devcontainer.json (100%) create mode 100644 .gitignore rename {firmware/.vscode => .vscode}/launch.json (100%) create mode 100644 LICENSE create mode 100644 firmware/components/insa/include/ui/ClockScreenSaver.h create mode 100644 firmware/components/insa/src/ui/ClockScreenSaver.cpp create mode 100644 firmware/components/led-manager/include/led_status.h create mode 100644 firmware/components/led-manager/src/hal_esp32/led_status.cpp create mode 100644 firmware/components/led-manager/src/hal_native/led_status.cpp delete mode 100644 firmware/config.dat diff --git a/firmware/.devcontainer/Dockerfile b/.devcontainer/Dockerfile similarity index 100% rename from firmware/.devcontainer/Dockerfile rename to .devcontainer/Dockerfile diff --git a/firmware/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json similarity index 100% rename from firmware/.devcontainer/devcontainer.json rename to .devcontainer/devcontainer.json diff --git a/.github/workflows/esp32_build.yml b/.github/workflows/esp32_build.yml index 7345085..fd692ae 100644 --- a/.github/workflows/esp32_build.yml +++ b/.github/workflows/esp32_build.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: idf_ver: [release-v5.4, release-v5.5, latest] - idf_target: [esp32c3, esp32h2, esp32s3, esp32p4] + idf_target: [esp32s3] runs-on: ubuntu-latest timeout-minutes: 30 @@ -39,4 +39,5 @@ jobs: with: esp_idf_version: ${{ matrix.idf_ver }} target: ${{ matrix.idf_target }} + path: firmware command: idf.py -DSDKCONFIG_DEFAULTS="sdkconfig.defaults;sdkconfig.release" build diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..39fc744 --- /dev/null +++ b/.gitignore @@ -0,0 +1,22 @@ +# Created by https://www.toptal.com/developers/gitignore/api/visualstudiocode +# Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode + +### VisualStudioCode ### +.vscode/* +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +!.vscode/*.code-snippets + +# Local History for Visual Studio Code +.history/ + +# Built Visual Studio Code Extensions +*.vsix + +### VisualStudioCode Patch ### +# Ignore all local history of files +.history +.ionide + +# End of https://www.toptal.com/developers/gitignore/api/visualstudiocode \ No newline at end of file diff --git a/firmware/.vscode/launch.json b/.vscode/launch.json similarity index 100% rename from firmware/.vscode/launch.json rename to .vscode/launch.json diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f505eff --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 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 Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + +The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are 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. + +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. + +Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + +A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + +The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + +An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + +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 Affero 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. Remote Network Interaction; Use with the GNU General Public License. + +Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + +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 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 work with which it is combined will remain governed by version +3 of the GNU General Public License. + +14. Revised Versions of this License. + +The Free Software Foundation may publish revised and/or new versions of +the GNU Affero 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 Affero 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 Affero 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 Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + +Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + +15. Disclaimer of Warranty. + +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +16. Limitation of Liability. + +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + +17. Interpretation of Sections 15 and 16. + +If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + +If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + +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 AGPL, see +. diff --git a/firmware/components/insa/CMakeLists.txt b/firmware/components/insa/CMakeLists.txt index 58c39d0..162e1c6 100644 --- a/firmware/components/insa/CMakeLists.txt +++ b/firmware/components/insa/CMakeLists.txt @@ -8,6 +8,7 @@ set(SOURCE_FILES src/ui/LightMenu.cpp src/ui/LightSettingsMenu.cpp src/ui/MainMenu.cpp + src/ui/ClockScreenSaver.cpp src/ui/ScreenSaver.cpp src/ui/SettingsMenu.cpp src/ui/SplashScreen.cpp diff --git a/firmware/components/insa/include/ui/ClockScreenSaver.h b/firmware/components/insa/include/ui/ClockScreenSaver.h new file mode 100644 index 0000000..99fe60e --- /dev/null +++ b/firmware/components/insa/include/ui/ClockScreenSaver.h @@ -0,0 +1,69 @@ +/** + * @file ClockScreenSaver.h + * @brief Animated clock screensaver implementation with bouncing time display + * @details This header defines the ClockScreenSaver class which provides an animated + * clock screensaver that shows the system time bouncing around the screen. + * The screensaver prevents screen burn-in while displaying useful information. + * @author System Control Team + * @date 2025-06-14 + */ + +#pragma once + +#include "MenuOptions.h" +#include "common/Widget.h" + +/** + * @class ClockScreenSaver + * @brief Animated clock screensaver widget for system idle periods + */ +class ClockScreenSaver final : public Widget +{ + public: + explicit ClockScreenSaver(menu_options_t *options); + void update(uint64_t dt) override; + void render() override; + void onButtonClicked(ButtonType button) override; + + private: + static constexpr int MOVE_INTERVAL = 50; // milliseconds between movements + static constexpr int X_VELOCITY = 1; // horizontal movement speed + static constexpr int Y_VELOCITY = 1; // vertical movement speed + static constexpr int TEXT_PADDING = 0; // padding around text for bounds checking + static constexpr const uint8_t *FONT = u8g2_font_profont15_tf; // font for time display + + menu_options_t *m_options; + uint64_t m_moveTimer; + + // Position and movement + int m_posX; + int m_posY; + int m_velocityX; + int m_velocityY; + + // Text dimensions (calculated once) + int m_textWidth; + int m_textHeight; + + /** + * @brief Initialize position and movement + */ + void initPosition(); + + /** + * @brief Update the text dimensions based on current time + */ + void updateTextDimensions(); + + /** + * @brief Get the current time as a formatted string + * @param buffer Buffer to store the formatted time + * @param bufferSize Size of the buffer + */ + void getCurrentTimeString(char *buffer, size_t bufferSize) const; + + /** + * @brief Check and handle collision with screen boundaries + */ + void checkBoundaryCollision(); +}; diff --git a/firmware/components/insa/src/ui/ClockScreenSaver.cpp b/firmware/components/insa/src/ui/ClockScreenSaver.cpp new file mode 100644 index 0000000..c25a307 --- /dev/null +++ b/firmware/components/insa/src/ui/ClockScreenSaver.cpp @@ -0,0 +1,122 @@ +#include "ui/ClockScreenSaver.h" +#include +#include + +ClockScreenSaver::ClockScreenSaver(menu_options_t *options) + : Widget(options->u8g2), m_options(options), m_moveTimer(0), m_posX(0), m_posY(0), m_velocityX(X_VELOCITY), + m_velocityY(Y_VELOCITY), m_textWidth(0), m_textHeight(0) +{ + initPosition(); +} + +void ClockScreenSaver::initPosition() +{ + // Start in the center of the screen + updateTextDimensions(); + m_posX = (u8g2->width - m_textWidth) / 2; + m_posY = (u8g2->height - m_textHeight) / 2; + + // Set initial velocity + m_velocityX = X_VELOCITY; + m_velocityY = Y_VELOCITY; +} + +void ClockScreenSaver::updateTextDimensions() +{ + char timeBuffer[32]; + getCurrentTimeString(timeBuffer, sizeof(timeBuffer)); + + // Set font (use a large font for better visibility) + u8g2_SetFont(u8g2, FONT); + + // Calculate text dimensions + m_textWidth = u8g2_GetStrWidth(u8g2, timeBuffer); + m_textHeight = u8g2_GetAscent(u8g2) - u8g2_GetDescent(u8g2); +} + +void ClockScreenSaver::getCurrentTimeString(char *buffer, size_t bufferSize) const +{ + time_t rawtime; + struct tm *timeinfo; + + time(&rawtime); + timeinfo = localtime(&rawtime); + + // Format time as HH:MM:SS + strftime(buffer, bufferSize, "%H:%M:%S", timeinfo); +} + +void ClockScreenSaver::update(const uint64_t dt) +{ + m_moveTimer += dt; + + // Move the clock position at regular intervals + if (m_moveTimer > MOVE_INTERVAL) + { + m_moveTimer = 0; + + // Update text dimensions (in case time format changes) + updateTextDimensions(); + + // Update position + m_posX += m_velocityX; + m_posY += m_velocityY; + + // Check for collisions with screen boundaries + checkBoundaryCollision(); + } +} + +void ClockScreenSaver::checkBoundaryCollision() +{ + // Check horizontal boundaries + if (m_posX <= TEXT_PADDING) + { + m_posX = TEXT_PADDING; + m_velocityX = X_VELOCITY; // Bounce right + } + else if (m_posX + m_textWidth >= u8g2->width - TEXT_PADDING) + { + m_posX = u8g2->width - m_textWidth - TEXT_PADDING; + m_velocityX = -X_VELOCITY; // Bounce left + } + + // Check vertical boundaries + if (m_posY <= TEXT_PADDING + m_textHeight) + { + m_posY = TEXT_PADDING + m_textHeight; + m_velocityY = Y_VELOCITY; // Bounce down + } + else if (m_posY >= u8g2->height - TEXT_PADDING) + { + m_posY = u8g2->height - TEXT_PADDING; + m_velocityY = -Y_VELOCITY; // Bounce up + } +} + +void ClockScreenSaver::render() +{ + // Clear screen with a black background + u8g2_SetDrawColor(u8g2, 0); + u8g2_DrawBox(u8g2, 0, 0, u8g2->width, u8g2->height); + u8g2_SetDrawColor(u8g2, 1); + + // Get current time + char timeBuffer[32]; + getCurrentTimeString(timeBuffer, sizeof(timeBuffer)); + + // Set font + u8g2_SetFont(u8g2, FONT); + + // Draw the time at current position + u8g2_DrawStr(u8g2, m_posX, m_posY, timeBuffer); +} + +void ClockScreenSaver::onButtonClicked(ButtonType button) +{ + // Exit screensaver on any button press + if (m_options && m_options->popScreen) + { + m_options->popScreen(); + } +} diff --git a/firmware/components/insa/src/ui/LightMenu.cpp b/firmware/components/insa/src/ui/LightMenu.cpp index a6249ba..5cef49e 100644 --- a/firmware/components/insa/src/ui/LightMenu.cpp +++ b/firmware/components/insa/src/ui/LightMenu.cpp @@ -9,15 +9,15 @@ */ namespace LightMenuItem { -constexpr uint8_t ACTIVATE = 0; ///< ID for the light activation toggle -constexpr uint8_t MODE = 1; ///< ID for the light mode selection -constexpr uint8_t LED_SETTINGS = 2; ///< ID for the LED settings menu item +constexpr auto ACTIVATE = 0; ///< ID for the light activation toggle +constexpr auto MODE = 1; ///< ID for the light mode selection +constexpr auto LED_SETTINGS = 2; ///< ID for the LED settings menu item } // namespace LightMenuItem namespace LightMenuOptions { -constexpr std::string LIGHT_ACTIVE = "light_active"; -constexpr std::string LIGHT_MODE = "light_mode"; +constexpr auto LIGHT_ACTIVE = "light_active"; +constexpr auto LIGHT_MODE = "light_mode"; } // namespace LightMenuOptions LightMenu::LightMenu(menu_options_t *options) : Menu(options), m_options(options) @@ -57,7 +57,8 @@ void LightMenu::onButtonPressed(const MenuItem &menuItem, const ButtonType butto if (button == ButtonType::SELECT) { toggle(menuItem); - if (getItem(menuItem.getId()).getValue() == "1") + const auto value = getItem(menuItem.getId()).getValue() == "1"; + if (value) { led_event_data_t payload = {.value = 42}; send_event(EVENT_LED_ON, &payload); @@ -69,7 +70,6 @@ void LightMenu::onButtonPressed(const MenuItem &menuItem, const ButtonType butto } if (m_options && m_options->persistenceManager) { - const auto value = getItem(menuItem.getId()).getValue() == "1"; m_options->persistenceManager->SetValue(LightMenuOptions::LIGHT_ACTIVE, value); m_options->persistenceManager->Save(); } @@ -82,9 +82,12 @@ void LightMenu::onButtonPressed(const MenuItem &menuItem, const ButtonType butto const auto item = switchValue(menuItem, button); if (button == ButtonType::LEFT || button == ButtonType::RIGHT) { + const auto value = getItem(item.getId()).getIndex(); + led_event_data_t payload = {.value = value}; + send_event(EVENT_LED_DAY + value, &payload); + if (m_options && m_options->persistenceManager) { - const auto value = getItem(item.getId()).getIndex(); m_options->persistenceManager->SetValue(LightMenuOptions::LIGHT_MODE, value); m_options->persistenceManager->Save(); } diff --git a/firmware/components/led-manager/CMakeLists.txt b/firmware/components/led-manager/CMakeLists.txt index 196606f..1a35a67 100644 --- a/firmware/components/led-manager/CMakeLists.txt +++ b/firmware/components/led-manager/CMakeLists.txt @@ -1,6 +1,7 @@ if (DEFINED ENV{IDF_PATH}) idf_component_register(SRCS src/hal_esp32/led_manager.cpp + src/hal_esp32/led_status.cpp INCLUDE_DIRS "include" PRIV_REQUIRES u8g2 diff --git a/firmware/components/led-manager/include/led_status.h b/firmware/components/led-manager/include/led_status.h new file mode 100644 index 0000000..17b6712 --- /dev/null +++ b/firmware/components/led-manager/include/led_status.h @@ -0,0 +1,3 @@ +#pragma once + +void led_status_init(); \ No newline at end of file diff --git a/firmware/components/led-manager/src/hal_esp32/led_manager.cpp b/firmware/components/led-manager/src/hal_esp32/led_manager.cpp index 0ff21c4..a684eef 100644 --- a/firmware/components/led-manager/src/hal_esp32/led_manager.cpp +++ b/firmware/components/led-manager/src/hal_esp32/led_manager.cpp @@ -21,7 +21,7 @@ uint64_t wled_init(void) led_strip_config_t strip_config = {.strip_gpio_num = CONFIG_WLED_DIN_PIN, .max_leds = 64, .led_model = LED_MODEL_WS2812, - .color_component_format = LED_STRIP_COLOR_COMPONENT_FMT_RGB, + .color_component_format = LED_STRIP_COLOR_COMPONENT_FMT_GRB, .flags = { .invert_out = false, }}; @@ -35,9 +35,9 @@ uint64_t wled_init(void) ESP_ERROR_CHECK(led_strip_new_rmt_device(&strip_config, &rmt_config, &led_strip)); - for (uint32_t i = 0; i < 64; i++) + for (uint32_t i = 0; i < 3; i++) { - led_strip_set_pixel(led_strip, i, 0, 0, 0); + led_strip_set_pixel(led_strip, i, 10, 10, 0); } led_strip_refresh(led_strip); diff --git a/firmware/components/led-manager/src/hal_esp32/led_status.cpp b/firmware/components/led-manager/src/hal_esp32/led_status.cpp new file mode 100644 index 0000000..9edcbbb --- /dev/null +++ b/firmware/components/led-manager/src/hal_esp32/led_status.cpp @@ -0,0 +1,7 @@ +#include "led_status.h" + +void led_status_init() +{ + // This function is intentionally left empty for the native implementation. + // It serves as a placeholder to maintain compatibility with the HAL interface. +} diff --git a/firmware/components/led-manager/src/hal_native/led_status.cpp b/firmware/components/led-manager/src/hal_native/led_status.cpp new file mode 100644 index 0000000..9edcbbb --- /dev/null +++ b/firmware/components/led-manager/src/hal_native/led_status.cpp @@ -0,0 +1,7 @@ +#include "led_status.h" + +void led_status_init() +{ + // This function is intentionally left empty for the native implementation. + // It serves as a placeholder to maintain compatibility with the HAL interface. +} diff --git a/firmware/config.dat b/firmware/config.dat deleted file mode 100644 index da898ebf24a7d26f0e00e50f3d6e45e896daa739..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53 mcmZQ#fB-Hios*fKQ4*h(&options); m_inactivityTracker = std::make_unique(60000, []() { - auto screensaver = std::make_shared(&options); + auto screensaver = std::make_shared(&options); options.pushScreen(screensaver); }); } diff --git a/firmware/main/button_handling.c b/firmware/main/button_handling.c index d58f7a0..74d6ba4 100644 --- a/firmware/main/button_handling.c +++ b/firmware/main/button_handling.c @@ -43,7 +43,7 @@ static void button_event_cb(void *arg, void *usr_data) } } -static void create_button(uint8_t gpio, int index) +static void init_button(uint8_t gpio, int index) { const button_config_t btn_cfg = {0}; const button_gpio_config_t btn_gpio_cfg = { @@ -74,7 +74,7 @@ void setup_buttons(void) ESP_LOGI(TAG, "Button queue created successfully"); for (int i = 0; i < sizeof(gpios) / sizeof(gpios[0]); i++) { - create_button(gpios[i], i); + init_button(gpios[i], i); } } diff --git a/firmware/partitions.csv b/firmware/partitions.csv index be9a670..d816e57 100644 --- a/firmware/partitions.csv +++ b/firmware/partitions.csv @@ -1,7 +1,8 @@ # Name , Type , SubType , Offset , Size , Flags nvs , data , nvs , 0x9000 , 20k , -otadata , data , ota , 0xe000 , 8k , +otadata , data , ota , , 8k , app0 , app , ota_0 , 0x10000 , 1024k , app1 , app , ota_1 , , 1024k , -spiffs , data , spiffs , , 1536k , +phy , data , phy , , 4k , coredump , data , coredump , , 64k , +spiffs , data , spiffs , , 1916k , diff --git a/firmware/sdkconfig.defaults b/firmware/sdkconfig.defaults index b68d213..a9ba1bb 100755 --- a/firmware/sdkconfig.defaults +++ b/firmware/sdkconfig.defaults @@ -1,4 +1,4 @@ -# activate Bluetooth Low Energy (BLE) +# Bluetooth CONFIG_BT_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y @@ -13,7 +13,10 @@ CONFIG_ESPTOOLPY_FLASHSIZE="4MB" # Partitions CONFIG_PARTITION_TABLE_CUSTOM=y -CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" -CONFIG_PARTITION_TABLE_FILENAME="partitions.csv" -CONFIG_PARTITION_TABLE_OFFSET=0x8000 -CONFIG_PARTITION_TABLE_MD5=y + +# Build type +CONFIG_APP_REPRODUCIBLE_BUILD=y + +# Core dump +CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH=y +CONFIG_ESP_COREDUMP_CAPTURE_DRAM=y diff --git a/firmware/src/ui/Device.cpp b/firmware/src/ui/Device.cpp index 73f374f..53faf62 100644 --- a/firmware/src/ui/Device.cpp +++ b/firmware/src/ui/Device.cpp @@ -6,6 +6,7 @@ #include "MenuOptions.h" #include "common/InactivityTracker.h" #include "hal_native/PersistenceManager.h" +#include "ui/ClockScreenSaver.h" #include "ui/ScreenSaver.h" #include "ui/SplashScreen.h" #include "ui/widgets/Button.h" @@ -56,15 +57,11 @@ Device::Device(void *appstate) : UIWidget(appstate) m_children.push_back(std::make_shared