From d84882937e511d2f3e4b4e09c438b3691d310048 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Tue, 2 Jan 2024 14:36:33 +0300 Subject: [PATCH] add new apps --- ReadMe.md | 2 + non_catalog_apps/tarot/.gitignore | 5 + non_catalog_apps/tarot/LICENSE | 674 ++++++++++++++++++ non_catalog_apps/tarot/README.md | 24 + non_catalog_apps/tarot/application.fam | 14 + non_catalog_apps/tarot/images/cursor.png | Bin 0 -> 116 bytes non_catalog_apps/tarot/images/github_icon.png | Bin 0 -> 1588 bytes non_catalog_apps/tarot/images/major_0.png | Bin 0 -> 1737 bytes non_catalog_apps/tarot/images/major_0_.png | Bin 0 -> 1919 bytes non_catalog_apps/tarot/images/major_1.png | Bin 0 -> 1816 bytes non_catalog_apps/tarot/images/major_10.png | Bin 0 -> 1797 bytes non_catalog_apps/tarot/images/major_10_.png | Bin 0 -> 1964 bytes non_catalog_apps/tarot/images/major_11.png | Bin 0 -> 1787 bytes non_catalog_apps/tarot/images/major_11_.png | Bin 0 -> 1952 bytes non_catalog_apps/tarot/images/major_12.png | Bin 0 -> 1737 bytes non_catalog_apps/tarot/images/major_12_.png | Bin 0 -> 1907 bytes non_catalog_apps/tarot/images/major_13.png | Bin 0 -> 1756 bytes non_catalog_apps/tarot/images/major_13_.png | Bin 0 -> 1929 bytes non_catalog_apps/tarot/images/major_14.png | Bin 0 -> 1759 bytes non_catalog_apps/tarot/images/major_14_.png | Bin 0 -> 1937 bytes non_catalog_apps/tarot/images/major_15.png | Bin 0 -> 1806 bytes non_catalog_apps/tarot/images/major_15_.png | Bin 0 -> 1977 bytes non_catalog_apps/tarot/images/major_16.png | Bin 0 -> 1783 bytes non_catalog_apps/tarot/images/major_16_.png | Bin 0 -> 1954 bytes non_catalog_apps/tarot/images/major_17.png | Bin 0 -> 1850 bytes non_catalog_apps/tarot/images/major_17_.png | Bin 0 -> 2037 bytes non_catalog_apps/tarot/images/major_18.png | Bin 0 -> 1786 bytes non_catalog_apps/tarot/images/major_18_.png | Bin 0 -> 1960 bytes non_catalog_apps/tarot/images/major_19.png | Bin 0 -> 1830 bytes non_catalog_apps/tarot/images/major_19_.png | Bin 0 -> 2011 bytes non_catalog_apps/tarot/images/major_1_.png | Bin 0 -> 1978 bytes non_catalog_apps/tarot/images/major_2.png | Bin 0 -> 1784 bytes non_catalog_apps/tarot/images/major_20.png | Bin 0 -> 1772 bytes non_catalog_apps/tarot/images/major_20_.png | Bin 0 -> 1955 bytes non_catalog_apps/tarot/images/major_21.png | Bin 0 -> 1817 bytes non_catalog_apps/tarot/images/major_21_.png | Bin 0 -> 1977 bytes non_catalog_apps/tarot/images/major_2_.png | Bin 0 -> 1966 bytes non_catalog_apps/tarot/images/major_3.png | Bin 0 -> 1797 bytes non_catalog_apps/tarot/images/major_3_.png | Bin 0 -> 1989 bytes non_catalog_apps/tarot/images/major_4.png | Bin 0 -> 1762 bytes non_catalog_apps/tarot/images/major_4_.png | Bin 0 -> 1926 bytes non_catalog_apps/tarot/images/major_5.png | Bin 0 -> 1754 bytes non_catalog_apps/tarot/images/major_5_.png | Bin 0 -> 1915 bytes non_catalog_apps/tarot/images/major_6.png | Bin 0 -> 1778 bytes non_catalog_apps/tarot/images/major_6_.png | Bin 0 -> 1951 bytes non_catalog_apps/tarot/images/major_7.png | Bin 0 -> 1763 bytes non_catalog_apps/tarot/images/major_7_.png | Bin 0 -> 1926 bytes non_catalog_apps/tarot/images/major_8.png | Bin 0 -> 1777 bytes non_catalog_apps/tarot/images/major_8_.png | Bin 0 -> 1937 bytes non_catalog_apps/tarot/images/major_9.png | Bin 0 -> 1738 bytes non_catalog_apps/tarot/images/major_9_.png | Bin 0 -> 1913 bytes non_catalog_apps/tarot/images/tarot_back.png | Bin 0 -> 1774 bytes non_catalog_apps/tarot/tarot.c | 448 ++++++++++++ non_catalog_apps/tarot/tarot.png | Bin 0 -> 1564 bytes non_catalog_apps/tone_gen/.gitignore | 6 + non_catalog_apps/tone_gen/LICENSE | 21 + non_catalog_apps/tone_gen/README.MD | 23 + non_catalog_apps/tone_gen/application.fam | 17 + non_catalog_apps/tone_gen/images/.gitkeep | 0 .../tone_gen/images/play_button.gif | Bin 0 -> 215 bytes .../tone_gen/images/play_button/frame_01.png | Bin 0 -> 592 bytes .../tone_gen/images/play_button/frame_02.png | Bin 0 -> 593 bytes .../tone_gen/images/play_button/frame_03.png | Bin 0 -> 592 bytes .../tone_gen/images/play_button/frame_04.png | Bin 0 -> 581 bytes .../tone_gen/images/play_button/frame_rate | 1 + .../tone_gen/images/settings_button.gif | Bin 0 -> 147 bytes .../images/settings_button/frame_01.png | Bin 0 -> 604 bytes .../images/settings_button/frame_02.png | Bin 0 -> 601 bytes .../images/settings_button/frame_rate | 1 + .../tone_gen/screenshots/menu.png | Bin 0 -> 1748 bytes .../tone_gen/screenshots/playback.png | Bin 0 -> 1487 bytes .../tone_gen/screenshots/settings.png | Bin 0 -> 1785 bytes non_catalog_apps/tone_gen/src/app_context.c | 141 ++++ non_catalog_apps/tone_gen/src/app_context.h | 62 ++ .../tone_gen/src/scenes/playback_scene.c | 88 +++ .../tone_gen/src/scenes/playback_scene.h | 11 + .../tone_gen/src/scenes/settings_scene.c | 119 ++++ .../tone_gen/src/scenes/settings_scene.h | 11 + .../tone_gen/src/scenes/starting_scene.c | 92 +++ .../tone_gen/src/scenes/starting_scene.h | 11 + .../tone_gen/src/system/audio_helper.c | 28 + .../tone_gen/src/system/audio_helper.h | 16 + non_catalog_apps/tone_gen/src/tone_gen.c | 140 ++++ non_catalog_apps/tone_gen/src/tone_gen.h | 36 + .../tone_gen/src/utils/linked_list.c | 71 ++ .../tone_gen/src/utils/linked_list.h | 23 + non_catalog_apps/tone_gen/tone_gen.png | Bin 0 -> 4231 bytes 87 files changed, 2085 insertions(+) create mode 100644 non_catalog_apps/tarot/.gitignore create mode 100644 non_catalog_apps/tarot/LICENSE create mode 100644 non_catalog_apps/tarot/README.md create mode 100644 non_catalog_apps/tarot/application.fam create mode 100644 non_catalog_apps/tarot/images/cursor.png create mode 100644 non_catalog_apps/tarot/images/github_icon.png create mode 100644 non_catalog_apps/tarot/images/major_0.png create mode 100644 non_catalog_apps/tarot/images/major_0_.png create mode 100644 non_catalog_apps/tarot/images/major_1.png create mode 100644 non_catalog_apps/tarot/images/major_10.png create mode 100644 non_catalog_apps/tarot/images/major_10_.png create mode 100644 non_catalog_apps/tarot/images/major_11.png create mode 100644 non_catalog_apps/tarot/images/major_11_.png create mode 100644 non_catalog_apps/tarot/images/major_12.png create mode 100644 non_catalog_apps/tarot/images/major_12_.png create mode 100644 non_catalog_apps/tarot/images/major_13.png create mode 100644 non_catalog_apps/tarot/images/major_13_.png create mode 100644 non_catalog_apps/tarot/images/major_14.png create mode 100644 non_catalog_apps/tarot/images/major_14_.png create mode 100644 non_catalog_apps/tarot/images/major_15.png create mode 100644 non_catalog_apps/tarot/images/major_15_.png create mode 100644 non_catalog_apps/tarot/images/major_16.png create mode 100644 non_catalog_apps/tarot/images/major_16_.png create mode 100644 non_catalog_apps/tarot/images/major_17.png create mode 100644 non_catalog_apps/tarot/images/major_17_.png create mode 100644 non_catalog_apps/tarot/images/major_18.png create mode 100644 non_catalog_apps/tarot/images/major_18_.png create mode 100644 non_catalog_apps/tarot/images/major_19.png create mode 100644 non_catalog_apps/tarot/images/major_19_.png create mode 100644 non_catalog_apps/tarot/images/major_1_.png create mode 100644 non_catalog_apps/tarot/images/major_2.png create mode 100644 non_catalog_apps/tarot/images/major_20.png create mode 100644 non_catalog_apps/tarot/images/major_20_.png create mode 100644 non_catalog_apps/tarot/images/major_21.png create mode 100644 non_catalog_apps/tarot/images/major_21_.png create mode 100644 non_catalog_apps/tarot/images/major_2_.png create mode 100644 non_catalog_apps/tarot/images/major_3.png create mode 100644 non_catalog_apps/tarot/images/major_3_.png create mode 100644 non_catalog_apps/tarot/images/major_4.png create mode 100644 non_catalog_apps/tarot/images/major_4_.png create mode 100644 non_catalog_apps/tarot/images/major_5.png create mode 100644 non_catalog_apps/tarot/images/major_5_.png create mode 100644 non_catalog_apps/tarot/images/major_6.png create mode 100644 non_catalog_apps/tarot/images/major_6_.png create mode 100644 non_catalog_apps/tarot/images/major_7.png create mode 100644 non_catalog_apps/tarot/images/major_7_.png create mode 100644 non_catalog_apps/tarot/images/major_8.png create mode 100644 non_catalog_apps/tarot/images/major_8_.png create mode 100644 non_catalog_apps/tarot/images/major_9.png create mode 100644 non_catalog_apps/tarot/images/major_9_.png create mode 100644 non_catalog_apps/tarot/images/tarot_back.png create mode 100644 non_catalog_apps/tarot/tarot.c create mode 100644 non_catalog_apps/tarot/tarot.png create mode 100644 non_catalog_apps/tone_gen/.gitignore create mode 100644 non_catalog_apps/tone_gen/LICENSE create mode 100644 non_catalog_apps/tone_gen/README.MD create mode 100644 non_catalog_apps/tone_gen/application.fam create mode 100644 non_catalog_apps/tone_gen/images/.gitkeep create mode 100644 non_catalog_apps/tone_gen/images/play_button.gif create mode 100644 non_catalog_apps/tone_gen/images/play_button/frame_01.png create mode 100644 non_catalog_apps/tone_gen/images/play_button/frame_02.png create mode 100644 non_catalog_apps/tone_gen/images/play_button/frame_03.png create mode 100644 non_catalog_apps/tone_gen/images/play_button/frame_04.png create mode 100644 non_catalog_apps/tone_gen/images/play_button/frame_rate create mode 100644 non_catalog_apps/tone_gen/images/settings_button.gif create mode 100644 non_catalog_apps/tone_gen/images/settings_button/frame_01.png create mode 100644 non_catalog_apps/tone_gen/images/settings_button/frame_02.png create mode 100644 non_catalog_apps/tone_gen/images/settings_button/frame_rate create mode 100644 non_catalog_apps/tone_gen/screenshots/menu.png create mode 100644 non_catalog_apps/tone_gen/screenshots/playback.png create mode 100644 non_catalog_apps/tone_gen/screenshots/settings.png create mode 100644 non_catalog_apps/tone_gen/src/app_context.c create mode 100644 non_catalog_apps/tone_gen/src/app_context.h create mode 100644 non_catalog_apps/tone_gen/src/scenes/playback_scene.c create mode 100644 non_catalog_apps/tone_gen/src/scenes/playback_scene.h create mode 100644 non_catalog_apps/tone_gen/src/scenes/settings_scene.c create mode 100644 non_catalog_apps/tone_gen/src/scenes/settings_scene.h create mode 100644 non_catalog_apps/tone_gen/src/scenes/starting_scene.c create mode 100644 non_catalog_apps/tone_gen/src/scenes/starting_scene.h create mode 100644 non_catalog_apps/tone_gen/src/system/audio_helper.c create mode 100644 non_catalog_apps/tone_gen/src/system/audio_helper.h create mode 100644 non_catalog_apps/tone_gen/src/tone_gen.c create mode 100644 non_catalog_apps/tone_gen/src/tone_gen.h create mode 100644 non_catalog_apps/tone_gen/src/utils/linked_list.c create mode 100644 non_catalog_apps/tone_gen/src/utils/linked_list.h create mode 100644 non_catalog_apps/tone_gen/tone_gen.png diff --git a/ReadMe.md b/ReadMe.md index e78a0e31ddf..2c92b8bc1a0 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -151,6 +151,7 @@ The Flipper and its community wouldn't be as rich as it is without your contribu | Sokoban | ![Games Badge] | [by Racso](https://github.com/Racso/fzero-apps/tree/main) | | [![Author Badge]](https://lab.flipper.net/apps/racso_sokoban) | | Игра «Виселица» («Балда») | ![Games Badge] | [by bolknote](https://github.com/bolknote/Flipper-Zero-Hangman-Game) | | ![None Badge] | | City Bloxx | ![Games Badge] | [by Milk-Cool](https://github.com/Milk-Cool/fz-citybloxx) | | ![None Badge] | +| Tarot spread | ![Games Badge] | [by pionaiki](https://github.com/pionaiki/fz-tarot) | | ![None Badge] | | Air Mouse | ![GPIO Badge] | [by ginkage](https://github.com/ginkage/FlippAirMouse/) | | [![Author Badge]](https://lab.flipper.net/apps/air_mouse) | | Plantower PMSx003 sensor reader | ![GPIO Badge] | [by 3cky](https://github.com/3cky/flipperzero-airmon) | | [![UFW Badge]](https://lab.flipper.net/apps/airmon) | | Bar code scanner emulator via COM port | ![GPIO Badge] | [by polarikus](https://github.com/polarikus/flipper-zero_bc_scanner_emulator) | | ![None Badge] | @@ -243,6 +244,7 @@ The Flipper and its community wouldn't be as rich as it is without your contribu | Resistance calculator | ![Tools Badge] | [by instantiator](https://github.com/instantiator/flipper-zero-experimental-apps) | | [![UFW Badge]](https://lab.flipper.net/apps/resistors) | | Simple calendar app | ![Tools Badge] | [by Adiras](https://github.com/Adiras/flipperzero-calendar) | | ![None Badge] | | Programmer Calculator | ![Tools Badge] | [by armixz](https://github.com/armixz/Flipper-Zero-Programmer-Calculator) | | ![None Badge] | +| Tone Generator | ![Tools Badge] | [by GEMISIS](https://github.com/GEMISIS/tone_gen/) | | ![None Badge] | | USB HID Autofire | ![USB Badge] | [by pbek](https://github.com/pbek/usb_hid_autofire) | | ![None Badge] | | USB Consumer Control | ![USB Badge] | [by WithSecureLabs](https://github.com/WithSecureLabs/usb-consumer-control/tree/main) | | ![None Badge] | diff --git a/non_catalog_apps/tarot/.gitignore b/non_catalog_apps/tarot/.gitignore new file mode 100644 index 00000000000..538bc536179 --- /dev/null +++ b/non_catalog_apps/tarot/.gitignore @@ -0,0 +1,5 @@ +dist/* +.vscode +.clang-format +.editorconfig +.DS_Store \ No newline at end of file diff --git a/non_catalog_apps/tarot/LICENSE b/non_catalog_apps/tarot/LICENSE new file mode 100644 index 00000000000..f288702d2fa --- /dev/null +++ b/non_catalog_apps/tarot/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/non_catalog_apps/tarot/README.md b/non_catalog_apps/tarot/README.md new file mode 100644 index 00000000000..1eb675c14ce --- /dev/null +++ b/non_catalog_apps/tarot/README.md @@ -0,0 +1,24 @@ +[![FAP: Build for multiple SDK sources](https://github.com/pionaiki/fz-tarot/actions/workflows/build.yml/badge.svg)](https://github.com/pionaiki/fz-tarot/actions/workflows/build.yml) +[![FAP Release](https://flipc.org/pionaiki/fz-tarot/badge)](https://flipc.org/pionaiki/fz-tarot) +[![FAP Candidate](https://flipc.org/pionaiki/fz-tarot/badge?channel=rc)](https://flipc.org/pionaiki/fz-tarot?channel=rc) +[![FAP dev](https://flipc.org/pionaiki/fz-tarot/badge?channel=dev)](https://flipc.org/pionaiki/fz-tarot?channel=dev) + +![Banner](.flipcorg/banner.png) + +# fz-tarot +Tarot spread for Flipper Zero. This app can give you a linear spread of the major arcana cards (minor arcana is planned to be added). + +## Download +- Full releases are available for the release firmware channel on the [releases page](https://github.com/pionaiki/fz-tarot/releases) +- Releases are available on [FlipC.org](https://flipc.org/pionaiki/fz-tarot) +- Releases for the dev, and rc channels are available on the [Github actions page](https://github.com/pionaiki/fz-tarot/actions/workflows/build.yml) + +## Roadmap +- [ ] Add upside-down cards +- [ ] Add Minor arcana +- [ ] Make the random number generator source radio +- [ ] Make a deck browser + +## Credits +- Code: [pionaiki](https://github.com/pionaiki) +- Art: [tihyltew](https://github.com/tihyltew) diff --git a/non_catalog_apps/tarot/application.fam b/non_catalog_apps/tarot/application.fam new file mode 100644 index 00000000000..4dfd4189260 --- /dev/null +++ b/non_catalog_apps/tarot/application.fam @@ -0,0 +1,14 @@ +App( + appid="tarot", # Must be unique + name="Tarot", # Displayed in menus + apptype=FlipperAppType.EXTERNAL, + entry_point="tarot_app", + stack_size=2 * 1024, + fap_category="Games", + fap_version=(0, 1), # (major, minor) + fap_icon="tarot.png", # 10x10 1-bit PNG + fap_description="Tarot card reader", + fap_author="pionaiki & tihyltew", + fap_weburl="https://github.com/pionaiki/fz-tarot", + fap_icon_assets="images", # Image assets to compile for this application +) diff --git a/non_catalog_apps/tarot/images/cursor.png b/non_catalog_apps/tarot/images/cursor.png new file mode 100644 index 0000000000000000000000000000000000000000..8746f1919459a40ea116dde4ae58b14f4a6e7e2c GIT binary patch literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^tRT$61SFYwH*Nw_oCO|{#S9GGLLkg|>2BR0prD$k zi(?3fZ1SJ~|LvKXnU$55TMjZTZAjwL$l1U!OCms5IEG`9Aj7dg;_oxo*E#}qFnGH9 KxvX} zCXJWVCi)y%vh~WYC)LgE^MY5UZCbHNhwIChUU0gG3PcWO~X<$55q(*qA`T8_+0~3&tVqgWc85q16 zrQz%#Mh%3T_DlvAsG2As4FWAd%m}BM7BIn8@Gf9Rut7@Kv@#q8Qk(@Ik;M!QBEBHZ zIOSBYJ_7@DNoGhyNrbPDRdRl=USdjqQmS4>ZUIOagH44MkeQoWlBiITo0C^;Rbi_H zR$&EXgM{^!6u?SKvTclI^QNG*{US7BqtRdaB%;CL(nm&1XUEI9ux#QnV^uh%1O*iw^gdpO-W5lEX^rV zvP;h_$tX>V&rHtGv(bkrL^S{+ifXQnJ{Bj~fIMy$8I)R_pHm77dOJg7BO7pVpok(O z0iq)Us}5vQbR7X1`6cMU^3c4@5<8dyXu?Rk zkRr&+v8bdxzbHEd92qDfiBlESBuJ&Hw8obt8RqPi*^K6}UjR!%*y&lgopOBfhz^YxJ3(9<;N*xYX#w zEmn3`&RL(U`<|cN{-b}<-lEz)c^iH;B@23m3GXjguX@9DWwUUn#8Rntr%!5Z`_;K? Sr+xMVWob`WKbLh*2~7YIxDDq3 literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_0.png b/non_catalog_apps/tarot/images/major_0.png new file mode 100644 index 0000000000000000000000000000000000000000..ead8212d8ea7bc512166010a9571996d538447ed GIT binary patch literal 1737 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}GKNru}~P+F7&wk0K5KQ$*cH#M)MSl>|3P#>GV zlFT%O3-gMh!2t{yeUJ=Ln*mmBo&_bzCcuz#tpK_Q>OY`Elfm{Dm!#+;DbP1EFtE@y zFw!-$)Q9^I=zN=$WUG?QlAKg!!;dQcGLWP(E0Dkm{7-BzhWHzhSK zu{5Vd$u2iBE59h-z(yaU2vsvg6xB={eJs}7fIMv#8I)R_pHm77b~{63BO7o~pok(O z0HPxTs}5vQbR7X1`6cMU^3c4@5<8dyXu?Rk zkRr#*v8bdxzbHEd91-wP#Hj*m3M534(kCSGgF_#f`t7)E^x-+lj!V?>_;q0B`seB5 z7~;YEcFIG(76qQ>r;mQ`-<0kv^;$!i`QPLxhs?IE-|eV#d!Lu)={H-G#RCq`KO1-9 zL%vmLgM3U|;jH7W^WMc|v%ag=EnKnQ?r8F}z>7bBb-viUIC@93(lzA?eXfcPfgNVG z-~9!>A4a(>kdzk#!G?O>`SY)+rp?DSYNG=aPalcL$cs`ENC4?tZw=q~Q1Q z#@^a4pCmyBk&6oyI#R`10m_Q?YrE9oj>rz95g(? zn@L3R_|v1mSHyX*XK*QTH8}SsV#13_qRYy(x4+u6+@sj&cG)~p8_R0ZeMxcep3N_L cQFQPx^F`Sr*CGjlB2YQw>FVdQ&MBb@0LE}xX#fBK literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_0_.png b/non_catalog_apps/tarot/images/major_0_.png new file mode 100644 index 0000000000000000000000000000000000000000..629106fbc3a6c8ae8502d8c7839adefb8b414fe5 GIT binary patch literal 1919 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}F<$xK7olvfP(7SMzGAQ^o_Jp+Ag+EObracBd{ z;MA6q4EI$*X;BW?PbtazsX3{+sd**EKz)W-t@A7>Nj3onuxka-8_-|@`Y#!5KygWm zK9T}`BLf2qT>~RsBTIdFumF8+1M-knWKe2xeoiSUXzUD)jcmZ)L=i;<5<~|=Lug)R zi5*M}nlQSq2!uS6J;S&3T(l3Aeew+hIt zNX?0G$pnUKG03Mz#y0v`C9rCYL}&zs5JDr81d_&-WUG?QlAKgZhMUb?MPg>Fh}T4HHViIQDzVpe`pyn&5AL=mcHh$yO=Hu_ksw?Rq{ zR*pp_<@rU~Az&xM&Bv(%>M@92NEr!|OTq2}W>Y&Z8+~||x8tgCE1d!?Vz@nB978;K zuTFL3Yc}9v@jUu}|D8=Mlr6g_M>+5p7#5ZtKjwM$+r4?$ZWVpsoG2c6bpPzVD;{2d zdxhbTb`5XquIsNX&$!Jhi(_3ao$3C|`ML7LHO^f-mc6!NKK)=>UfumxlXveQiiXc z`ML2};Dpm$9^t#XN_bP)To*?)c}K8%oi?6h*`)n(=ZC-BVt#&^S#E#9xZSil%Rl_% nPUHH#=d1s3sh15YjlaXca$=b|JL~GNpwiLP)z4*}Q$iB}$tslx literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_1.png b/non_catalog_apps/tarot/images/major_1.png new file mode 100644 index 0000000000000000000000000000000000000000..3080b446d413dce290fcad1bdfef1674f5f38af0 GIT binary patch literal 1816 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}GKNru}~P+F7&wk0K5KQ$*cH#M)MSl>|3P#>GV zlFT%O3-gMh!2t{yeUJ=Ln*mmBo&_bzCcuz#tpK_Q>OY`Elfm{Dm!#+;DbP1EFtE@y zFw!-$)Q9^I=zN=$WUG?QlAKg!!;dQcGLWP(E0Dkm{7-BzhWHzhSK zu{5Vd$u2iBE59h-&_*Ak2vsvg6xB={eJs}7fIMv#8I)R_pHm77b~{63BO7o~pok(O z0HPxTs}5vQbR7X1`6cMU^3c4@5<8dyXu?Rk zkRr#*v8bdxzbHEd91-wP#Hj*m3M534(kCSGgF_#f`t7)E^x-+lj_Yd4n`OY9>+9*_ z7~;WucIs`e76Tra(vSc5N8I?T!JO=)&nUl5A$Ri0lUq)``(=A<*SgcUA0N;Qc)0&; zoWY-!0jt$@4r;qy_{YEJSKc}CDBE{y>YO7=O_=BZiV`@wUZp#gcelO>$MQ#k%{tQ> zJ4+wNEn%CgJ*VyTM!yHW(XT(ZZktr(9oM%xV)eggGT~Jr3_cGeZh!xKBKBg0`RK6Nqe@v}Ru4biUaihWIro81%cSWhYC_xZ=BF3?!m-)6|Pxbgs}8&Fij z_P2!fV{z^O>WdgQw7sugyXX9q;O9cF$M=0-cIo&|Zud6_a{PIw-;_9{`O5S~?0Esb z@U?7vU%x!WdhHFb$mw;?8`bV~-<@mD@W{&1ba{b(!G?q*Ht(t$XUZ3dTOByaRB`Y1 zl==fxKOD;P`Sr|y9gA^sTFb6wpCw;-Y`$o^dwt+T4gT-!P2Y}rnep#s2NheMu6{1- HoD!MFgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}GKNru}~P+F7&wk0K5KQ$*cH#M)MSl>|3P#>GV zlFT%O3-gMh!2t{yeUJ=Ln*mmBo&_bzCcuz#tpK_Q>OY`Elfm{Dm!#+;DbP1EFtE@y zFw!-$)Q9^I=zN=$WUG?QlAKg!!;dQcGLWP(E0Dkm{7-BzhWHzhSK zu{5Vd$u2iBE59h-(7;9?q6$?vL=@Ff8+|PH+kkv+6&aLToS#z)3U@n0V*WQFI*v8Tlpoz!X)Kne3TYl3G+y1Wa9E8)5e0R)KC7!t&6(%o0180cgTV zx{zYW%CV@VJijPA1RN8HV8p2eY78Vuky0om`GbQWnEvg!Z1mxI$&QQXh|pSK-nH;_ zaSZX`Jv%j;?~nlxi}aP>@shiyvaLK>`}<8}IJrd!x4MNBL%R z&bpG7KJ9O>Y<>8AM*FO(nzsuympQs`ExJ`8l5EX;j{lbDAC>g*i(RwwCNI6N^x~9v zVBPO?Q}^tu<38^;oqzxPTA@epxKI7n4Od{aSyuZ^gDIxab3ALv?IAi6=O z#sAvhdG9SX=dduYI;4H{3cH2DlvG|BAGy+oROUO)Z}v7ecZPran?A90UiY4pGM|kr zpXYZoeXf|J8C1-YVwfIqd6(FJt`No@n;84FLaZbvm@D*K6{P^RO3v6}e!%>;$UCh7 zGx1&bKilfJp6@DUdsf}JPK~30ef5T*ryExt{5|)##npS#;g&z9N>35qbNC{sZ}9wYZwd@U1_n=8KbLh*2~7Y5Gj@Rh literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_10_.png b/non_catalog_apps/tarot/images/major_10_.png new file mode 100644 index 0000000000000000000000000000000000000000..aa39c4ffc66be2b1def7beaf17a0c543f402ed51 GIT binary patch literal 1964 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 VQQfDw8C3r=c)I$ztaD0e0sv^1j literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_12.png b/non_catalog_apps/tarot/images/major_12.png new file mode 100644 index 0000000000000000000000000000000000000000..9551abf427345a10c31a77a580d355b992c71b35 GIT binary patch literal 1737 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}GKNru}~P+F7&wk0K5KQ$*cH#M)MSl>|3P#>GV zlFT%O3-gMh!2t{yeUJ=Ln*mmBo&_bzCcuz#tpK_Q>OY`Elfm{Dm!#+;DbP1EFtE@y zFw!-$)Q9^I=zN=$WUG?QlAKg!!;dQcGLWP(E0Dkm{7-BzhWHzhSK zu{5Vd$u2iBE59h-(8xv~q6$?vL=@Ff8+|PH+kkv+6&aLToS#z)3U@n0W1yKBqKFuP z=!n3o16dSZM?gk?Nj@+|6=f!S=9Q!t6%+we7uZIaeYjPin}x7EG%vHn4rTzFFp@5$ z*s*dfDk;w|$_@d?1R@x5DuEgU2~wmK3Q7Lp;0LCEJ1!f2cwVyOx>&fg37Eb9c)B=- zc<^4G7RYy4fyepumEZA|hdrh#xxCqudg++I7Zd;SrI&B*?!R_xV|B?JMy(&aZ?d!O zmzf%y8u)hmhl_FHh0CqE+mqxLgsjVo|5|e(eEGW*a~neb^n44s9({g($p`C#dtbB6 z4;OErQCED|CcUmt^~c@nxTf=7tG`Wo@PD<8{;Dk3nw8(?x$pm(8kRe$ph8}&Rs3msX#HmnX6CV7t>%) zSZZ+kIQImt`Jsj9JWkl8%U%4pHDaZjLsRwjOJWWp4ecq0TUBotsMb5p%=*ivvySyU Y^OgUdelbQ*DnaFpr>mdKI;Vst01qc%djJ3c literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_12_.png b/non_catalog_apps/tarot/images/major_12_.png new file mode 100644 index 0000000000000000000000000000000000000000..63acaf94849406cb2482a488c64ac394c7be8962 GIT binary patch literal 1907 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}F<$xK7olvfP(7SMzGAQ^o_Jp+Ag+EObracBd{ z;MA6q4EI$*X;BW?PbtazsX3{+sd**EKz)W-t@A7>Nj3onuxka-8_-|@`Y#!5KygWm zK9T}`BLf2qT>~RsBTIdFumF8+1M-knWKe2xeoiSUXzUD)jcmZ)L=i;<5<~|=Lug)R zi5*M}nlQSq2!uS6J;S&3T(l3Aeew+hIt zNX?0G$pnUKG03Mz#y0v`C9rCYL}&zs5JDr81d_&-WUG?QlAKgZhMUb?MPg>Fh}T4HHViIQDzVpe`pydlt5h$>Xw5K&Y^ZS=9&Z-bN` ztQ?C<%JYk|L%?oCSb$Rr)N2sSkg^gapMo6*%&2x;Hu~^PZ^!lb%i$fsa^SD0i(`lf z@7pN{`3@`aI48dP|Nm2)cIBo;2~O8#)q1&EW{D@aetRyl_j}oQi5qNMKgu^tv)Jb? z=lU?AbXUo=wRt&HnSC70b{`6`YCZ09Y)<7_iDLQ9TUoOv`dpoLqLzKW7W)a+uyeXL z!E0WHKNtHKzAkLvb#4Ff=fUSET4bBwEoWU;aN;~y$iWl(e?>R1E9~E;R?0=8ziPb+`m$0T1;TxZ=0$W`;Kqcx!07=u>E`JkDpGl zU;WRW3%m1mQ;-1fhApkJMzdoVs@kY+*45sAx9u^TjsW-Z9bZoOdQO#4>RZ*t6|kT2 ZJFDH_PH%^unS!7a(bLt>Wt~$(698sMko^Dv literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_13.png b/non_catalog_apps/tarot/images/major_13.png new file mode 100644 index 0000000000000000000000000000000000000000..f68f8a4582e3ab9c956ee5b3931342bf841f37a8 GIT binary patch literal 1756 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}GKNru}~P+F7&wk0K5KQ$*cH#M)MSl>|3P#>GV zlFT%O3-gMh!2t{yeUJ=Ln*mmBo&_bzCcuz#tpK_Q>OY`Elfm{Dm!#+;DbP1EFtE@y zFw!-$)Q9^I=zN=$WUG?QlAKg!!;dQcGLWP(E0Dkm{7-BzhWHzhSK zu{5Vd$u2iBE59h-(AY*Fq6$?vL=@Ff8+|PH+kkv+6&aLToS#z)3U@n0V*WQFI*v8Tlpoz!X)Kne3TYl3G+y1Wa9E8)5e0R)KC7!t&6(%o0180cgTV zx{zYW%CV@VJijPA1RN8HV8p2eY78Vuky0om`GbQWnEvg!Z1mxI$&M>X_`NAG@A7-P zIEHxeo}F@#uf>4F<@T|P5C7}0UCuk+vTPgAg4cQ1yfs^oH(dL(%Kx0D?cb0bCec63 zZ*n$uyH4%fGu6=N$Hl17g6+n_d`E*CR&M?iKldl&_Eq&oX??ED`M0m#S$gB;|D}6Q z@=27%i$2(zcQxY1!(Hn#@0XX|`BQXo)?(uqXV%Bage6Fw-gF_&$~S#7XW-P$4~&cM z^~(C3dOqd%y!(fbe_J4HcQ*g4>(uWGY2JZh4TmBRz1SXS*ZSS_%(p44<+mP4k-5>G zAEH;?In_37RZNqO#yL}iPoYl*4Vb<3!on-%YpyOU2sB%#p%|?9Vkc>2^e}(teIwx4%r8?n7gY3ky85}Sb4q9e0CUG_Bme*a literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_13_.png b/non_catalog_apps/tarot/images/major_13_.png new file mode 100644 index 0000000000000000000000000000000000000000..b102d6a3d61b4296607c8a743ae508f1bd9c5ee2 GIT binary patch literal 1929 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 literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_14_.png b/non_catalog_apps/tarot/images/major_14_.png new file mode 100644 index 0000000000000000000000000000000000000000..129784727eee6df0fa7fb022af8167f195117936 GIT binary patch literal 1937 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}F<$xK7olvfP(7SMzGAQ^o_Jp+Ag+EObracBd{ z;MA6q4EI$*X;BW?PbtazsX3{+sd**EKz)W-t@A7>Nj3onuxka-8_-|@`Y#!5KygWm zK9T}`BLf2qT>~RsBTIdFumF8+1M-knWKe2xeoiSUXzUD)jcmZ)L=i;<5<~|=Lug)R zi5*M}nlQSq2!uS6J;S&3T(l3Aeew+hIt zNX?0G$pnUKG03Mz#y0v`C9rCYL}&zs5JDr81d_&-WUG?QlAKgZhMUb?MPg>Fh}T4HHViIQDzVpe`pyrGGWK13C&ZipzVp*H$h?6*Nm z4_1yvCFS`=*&$#zA}qkE1nM=2Wk^{Gl25@717=h^E*pJ#rnlqTx8k=6u#l1Vba4#v z;N3dyB44ushwIx%|Nn3LJZnyi0awY!+J#FCb}UGfzP|UE#PQp&kI5~H%Wr;Id*jW9 z=!facB8pdsecKad+~1WFz_RrLi+%oqL$kNmKMTCQ;^-~IlE>e*-D6V%d!nq%YXaxh zyj-nOz;eKR_wpMhI-!dgwsALHTXu>w#bi!uV18|#eW+go%eA{_{O7$9@jJa~#SyKG z_g>4aEzx0EbmW}zOfB{mOd8u3A8?OJ@!l~>C*(O_M4@g4%NJJB$KlfN5@o;U?g%Mu z2&?7#o|T)FKL60(OIMRLWlH~xMgE$(IO4ip{EF~vzULm994gW&JNIVqTv5-5O)In$ z96p4~E-y&9cdqN-k-L4-4u8*|QV&b#w8-4Z6}MOXJGZ=BqYaB*9H?++@O1TaS?83{ F1OPd&pIiU{ literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_15.png b/non_catalog_apps/tarot/images/major_15.png new file mode 100644 index 0000000000000000000000000000000000000000..55121998e28e37b20c1b3081c389c225d4e33fa6 GIT binary patch literal 1806 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 aU*s1@P6{(-n$`#^l{{VjT-G@yGywqR{(7$f literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_16_.png b/non_catalog_apps/tarot/images/major_16_.png new file mode 100644 index 0000000000000000000000000000000000000000..228f671b1494318a7f97b9f79b65674b41faf21c GIT binary patch literal 1954 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 literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_18_.png b/non_catalog_apps/tarot/images/major_18_.png new file mode 100644 index 0000000000000000000000000000000000000000..f2ab2d64d6e51b9ef3cee574ca67248b7a6614fe GIT binary patch literal 1960 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}F<$xK7olvfP(7SMzGAQ^o_Jp+Ag+EObracBd{ z;MA6q4EI$*X;BW?PbtazsX3{+sd**EKz)W-t@A7>Nj3onuxka-8_-|@`Y#!5KygWm zK9T}`BLf2qT>~RsBTIdFumF8+1M-knWKe2xeoiSUXzUD)jcmZ)L=i;<5<~|=Lug)R zi5*M}nlQSq2!uS6J;S&3T(l3Aeew+hIt zNX?0G$pnUKG03Mz#y0v`C9rCYL}&zs5JDr81d_&-WUG?QlAKgZhMUb?MPg>Fh}T4HHViIQDzVpe`pyrG4SK13C&ZipzVp*H$h?6*Nm z4_1yvCFS`=*&$#zA}qkE1nM=2Wk^{Gl25@717=h^E*pJ#rnlp=5a`kY7BWVjE{-7{ zyho?q=4&?KaZY^nzrJ$y#GW2$XUW|kE?w*NpTw6td;Z&*&ntg@xx7Jm#e@1;whJG+ zFABRHBK0RQf8+h~d1|{B=_{YSdgEoWlU}m*4z_?P0czRGn#*x2||~tG8}lS9yW?!x+icHrLx8p4tUIJD66fDY0j>r++xpVUvHvR`8wMfjd0D^50!{%-T_I{B_H^^+{a!u3q2% zG|OGtwXpT+)(?5LtW##a3%z_uHAc9EpJSOy&u^2TsyoCE-Rmy>sJ7+M{h!La3QX2l cedl?{9n0Jveo(boFyt=akR{08;;}ApigX literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_19.png b/non_catalog_apps/tarot/images/major_19.png new file mode 100644 index 0000000000000000000000000000000000000000..d65765cd55d021a623a12ddef20cb98da6ef566e GIT binary patch literal 1830 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}GKNru}~P+F7&wk0K5KQ$*cH#M)MSl>|3P#>GV zlFT%O3-gMh!2t{yeUJ=Ln*mmBo&_bzCcuz#tpK_Q>OY`Elfm{Dm!#+;DbP1EFtE@y zFw!-$)Q9^I=zN=$WUG?QlAKg!!;dQcGLWP(E0Dkm{7-BzhWHzhSK zu{5Vd$u2iBE59h-(9%X9q6$?vL=@Ff8+|PH+kkv+6&aLToS#z)3U@n0V*WQFI*v8Tlpoz!X)Kne3TYl3G+y1Wa9E8)5e0R)KC7!t&6(%o0180cgTV zx{zYW%CV@VJijPA1RN8HV8p2eY78Vuky0om`GbQWnEvg!Z1mxI$&Sl^(i0V6-i`Eh zaSZX`-8=1J9smEr;@8D?tk&& zn6>}+H?0!otQ+GCB>eb3am};xon<~@S6FVWcav%_tH`CyuMRssCDLSV)J$S`AOD%uwCeT%yChsFE1dBrQM zOa|4vTfg!iWwXAzHR}zZRH<0fnw|eY^QMO1>XZ+*wU+naxURLcN@qqHE62iq!^nL8 zE4&6yi`Qj4z4+)R7Gs?jbZJMs5?}G!2b_~knk=n(c4e`)7Zgn}fA%Q3eqlYs;xod2 T0jklU(viW_)z4*}Q$iB}Lym#7 literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_19_.png b/non_catalog_apps/tarot/images/major_19_.png new file mode 100644 index 0000000000000000000000000000000000000000..c4d6fc739a573e90c1f5e7d2ef8a83266ebbe5e9 GIT binary patch literal 2011 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}F<$xK7olvfP(7SMzGAQ^o_Jp+Ag+EObracBd{ z;MA6q4EI$*X;BW?PbtazsX3{+sd**EKz)W-t@A7>Nj3onuxka-8_-|@`Y#!5KygWm zK9T}`BLf2qT>~RsBTIdFumF8+1M-knWKe2xeoiSUXzUD)jcmZ)L=i;<5<~|=Lug)R zi5*M}nlQSq2!uS6J;S&3T(l3Aeew+hIt zNX?0G$pnUKG03Mz#y0v`C9rCYL}&zs5JDr81d_&-WUG?QlAKgZhMUb?MPg>Fh}T4HHViIQDzVpe`pyrHFyK13C&ZipzVp*H$h?6*Nm z4_1yvCFS`=*&$#zA}qkE1nM=2Wk^{Gl25@717=h^E*pJ#rnlpoxU~5qu#idhba4#v z;N3g*V&7o}9+ug`|Nl>azsaL{+R;WY*W=E-r>i!2-iq7*eaE`jrB!!sOkeTHKSy@P zujR86KK(P8`68aG}gD;dU36v%FL(5}3Q`+ntBD>KEUiJIf#vd_HFF@7s%5 z+OyUMX8KoEu~#g<$$oW)iBI|Ox4AcGvOP+gIEU?f*`*B$zR@Qm!(a zmm!rhrR`m@LdB*DeBZk~SDAb(@i-Ke{edeev!Ro7^1G;JZwt!@U$YB;sE0oO?sc)_ zudTa<FVdQ&MBb@02DsT>Hq)$ literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_1_.png b/non_catalog_apps/tarot/images/major_1_.png new file mode 100644 index 0000000000000000000000000000000000000000..8e7db9310590a525e6d3933e471de4352bb468b5 GIT binary patch literal 1978 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}F<$xK7olvfP(7SMzGAQ^o_Jp+Ag+EObracBd{ z;MA6q4EI$*X;BW?PbtazsX3{+sd**EKz)W-t@A7>Nj3onuxka-8_-|@`Y#!5KygWm zK9T}`BLf2qT>~RsBTIdFumF8+1M-knWKe2xeoiSUXzUD)jcmZ)L=i;<5<~|=Lug)R zi5*M}nlQSq2!uS6J;S&3T(l3Aeew+hIt zNX?0G$pnUKG03Mz#y0v`C9rCYL}&zs5JDr81d_&-WUG?QlAKgZhMUb?MPg>Fh}T4HHViIQDzVpe`pyrGRgL=mcHh$yO=Hu_ksw?Rq{ zR*pp_<@rU~Az&xM&Bv(%>M@92NEr!|OTq2}W>Y&Z8+~||x8q`9Z;%5PF>anNjv*er zXQ$leI%FW=68-W2{v8WsQ$JYjz8LZ=L15GM&67=b-21k5-Rq)nw>EaKcr^cPoXU?P zE71c?*N-f|Zt_aAfd3uanPX=(3hvn_Zkj3F@bipj`~$8{0S)m7oGbV)7_3_2tN7}1 z*3``h&dMB+$i6Ihs8)34rG4xw6Y99lBU(f5{A^iz_fYWF^~_Ngq93Gk&d*!$XS=`w zMLXX0K0m+QU0e~U*WswQM1MBZrSkr7OyLHzMIU=5{932`AwR)f&7k(`-h=4}7c=%% z*Ed^hi2lyMx$W%2hj~Xuo;~^$HRr=SHOD=>W)$BGy{wgf@UzHz@kPsecG`XKFA)3v z!-nzmTwC7lN%5ZSr*D`te_0!5sQoVK&BDKeej2lFIyRoG+cQnC(Cy8_ny`}-8{_9E z9qOy``RccSnvBWg|NMVmY~T6m?m3y#ZEkn0%j_@6b3c%r4JueYUHx3vIVCg!0DqFZ ArT_o{ literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_2.png b/non_catalog_apps/tarot/images/major_2.png new file mode 100644 index 0000000000000000000000000000000000000000..dbab1dcb41e74229f04297bf77aa1f6292760033 GIT binary patch literal 1784 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}GKNru}~P+F7&wk0K5KQ$*cH#M)MSl>|3P#>GV zlFT%O3-gMh!2t{yeUJ=Ln*mmBo&_bzCcuz#tpK_Q>OY`Elfm{Dm!#+;DbP1EFtE@y zFw!-$)Q9^I=zN=$WUG?QlAKg!!;dQcGLWP(E0Dkm{7-BzhWHzhSK zu{5Vd$u2iBE59h-$VMNc2vsvg6xB={eJs}7fIMv#8I)R_pHm77b~{63pqUt=hzNk_ zh`_1?SrlDIKt_H^J}^NQWhQ&(m82FG6af<#*hZLrxK*H=g|Iv{FSEoBW&oNnk}jmk zv2rXbDbFv;4gp65JQQ)NfSLjcQKa+#{&Xt0K=jw)-W3N{ zh3{MCyFHcPM(DBO&*yiS5gDe!f zVoeQiMm*ms;-`H3vG1qK*%IGNIoC4;&EZXR;QStb>^Rp0JBRJ6a}IHIX1`jLdoc6V zg43GmONekT-G@yGywo?zj?s` literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_20.png b/non_catalog_apps/tarot/images/major_20.png new file mode 100644 index 0000000000000000000000000000000000000000..dc51ec6b510f4704625089b3a55a1db1abeddfb7 GIT binary patch literal 1772 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 literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_21.png b/non_catalog_apps/tarot/images/major_21.png new file mode 100644 index 0000000000000000000000000000000000000000..f8f2d84d50a100c199895926b30d314acb658bee GIT binary patch literal 1817 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}GKNru}~P+F7&wk0K5KQ$*cH#M)MSl>|3P#>GV zlFT%O3-gMh!2t{yeUJ=Ln*mmBo&_bzCcuz#tpK_Q>OY`Elfm{Dm!#+;DbP1EFtE@y zFw!-$)Q9^I=zN=$WUG?QlAKg!!;dQcGLWP(E0Dkm{7-BzhWHzhSK zu{5Vd$u2iBE59h-$k0X~q6$?vL=@Ff8+|PH+kkv+6&aLToS#z)3U@n0V*WQFI*v8Tlpoz!X)Kne3TYl3G+y1Wa9E8)5e0R)KC7!t&6(%o0180cgTV zx{zYW%CV@VJijPA1RN8HV8p2eY78Vuky0om`GbQWnEvg!Z1mxI$&RZ~r(+^8@A`PU zIEHxeZk@s{)MUWpa`555@G!BOGiEAJmCM{NtL@fb*xdKNviGrt&EB*(3aftjZ)WHH z^D3}%(c%chT_2uae8yR^sbbxNC%X%Lc>>xh*n*DkzxR`Az19C&^I0DF)wk}958rXX zcIMm4=oNEimvOU8C5Fy>c0@?efi1M}PvB&sb?;_uEnjgi>R!v=sL1`7zsqE>m2Cc& z(HVE&S5GiFp(CCB$GyF$%nS54g{t^0lVjcVSFX8uPzPQZF`(PcQ zAon-R+=6MB@X7Fv%d;Qc3pJ3`E)MJd_iVrGfj3o~*aF25CYeswUO1KW`l+byuN7{) zXU}13v)DTS;)BkOEy^}b3r;6h>CXJ%mv<@U-->dDneKP^d)F=xUL{%*2r9QcUHx3v IIVCg!06SlTQ2+n{ literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_21_.png b/non_catalog_apps/tarot/images/major_21_.png new file mode 100644 index 0000000000000000000000000000000000000000..22631b03a3229b1a23281335d693553db02b9187 GIT binary patch literal 1977 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}F<$xK7olvfP(7SMzGAQ^o_Jp+Ag+EObracBd{ z;MA6q4EI$*X;BW?PbtazsX3{+sd**EKz)W-t@A7>Nj3onuxka-8_-|@`Y#!5KygWm zK9T}`BLf2qT>~RsBTIdFumF8+1M-knWKe2xeoiSUXzUD)jcmZ)L=i;<5<~|=Lug)R zi5*M}nlQSq2!uS6J;S&3T(l3Aeew+hIt zNX?0G$pnUKG03Mz#y0v`C9rCYL}&zs5JDr81d_&-WUG?QlAKgZhMUb?MPg>Fh}T4HHViIQDzVpe`pypf@eK13C&ZipzVp*H$h?6*Nm z4_1yvCFS`=*&$#zA}qkE1nM=2Wk^{Gl25@717=h^E*pJ#rnlpAJ~GuESjaegx;Tb- z@NS*f*mc-|$N6^h|Np1UFFz1<-Fkb?6E5eC%J$X^d*1DTpML*)?$^)9@)mXNpS3sh z!ThHo%=>a;_13R@^X`bQ%nIfchO8T_Z%m$c-AT~x=*(pQTW{y8`7eHywMp{6L8TZ+ zRHJF`*6ClFV_a=yr__qbd&N~9*t~jn+V!jlbC~rQ?p|CT@QTgiWauuDcj1c|ryu%! zgxSV=`On)G4fWAI`=wX4l&2+xzskSG_(f z+cM^9m5;pgABtRTsc^HuuWNivect&e{>ye{FU!`sFUGa=x%JWcRh-AyOkT;Tenukx vm59uS`3-EGUw*{fyTls{|1jB{UHG42S@g0nW(}iLpmNpI)z4*}Q$iB}G_|qe literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_2_.png b/non_catalog_apps/tarot/images/major_2_.png new file mode 100644 index 0000000000000000000000000000000000000000..c19a6e5eb44a8fef3e84d14721ad233845703866 GIT binary patch literal 1966 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}F<$xK7olvfP(7SMzGAQ^o_Jp+Ag+EObracBd{ z;MA6q4EI$*X;BW?PbtazsX3{+sd**EKz)W-t@A7>Nj3onuxka-8_-|@`Y#!5KygWm zK9T}`BLf2qT>~RsBTIdFumF8+1M-knWKe2xeoiSUXzUD)jcmZ)L=i;<5<~|=Lug)R zi5*M}nlQSq2!uS6J;S&3T(l3Aeew+hIt zNX?0G$pnUKG03Mz#y0v`C9rCYL}&zs5JDr81d_&-WUG?QlAKgZhMUb?MPg>Fh}T4HHViIQDzVpe`pJkU~zB2>)~QB*T+^s!iPgOnVs z9E(cI^NX@Wz)pmlk5dKIV-UNLG7==0g53qorgmI5`tU4o$JKFkUIVa*vGR0r4DsMS zJM|zRlOm5x?BmM+|MRCh&d*HqP82pR($u|tJfJu4`?hVlyKAaU-?(1ceZV$z`jH(~ z3(p+2J5#oUujb-|((~?CSJw;e&#&rDzw#jAsl~N_2P)_NzwmS4`@0kGoVj*oCqqY4 z$%l-XE6E}G^LIMiq))qIyZqh87I%*7MGl4U6P~Kh5lro6dc7w~bq`aBc=1DldA5-b z<+EQdD`4qjU|kg_T)jo!s^5XLaPHO8d21D8lGqs&MCJs4k2v(0L&B3~bGb$(XaBhy z!mJ(D4TjSSTKGQ7%ssAZ;k!EE%kl>%YmcozbpQXtchAmnxZR)i-nx9c#m8Oy{eF6^ z{-vAEpvCyx$J{pG_iKNVTkM+B=TmpPo^xClu3NuAC|i(!%aRQ|{#DDD{%`oaQ(*bF l*$>n{&a_FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}GKNru}~P+F7&wk0K5KQ$*cH#M)MSl>|3P#>GV zlFT%O3-gMh!2t{yeUJ=Ln*mmBo&_bzCcuz#tpK_Q>OY`Elfm{Dm!#+;DbP1EFtE@y zFw!-$)Q9^I=zN=$WUG?QlAKg!!;dQcGLWP(E0Dkm{7-BzhWHzhSK zu{5Vd$u2iBE59h-*hU|s2vsvg6xB={eJs}7fIMv#8I)R_pHm77b~{63BO7o~pok(O z0HPxTs}5vQbR7X1`6cMU^3c4@5<8dyXu?Rk zkRr#*v8bdxzbHEd91-wP#Hj*m3M534(kCSGgF_#f`t7)E^x-+lj;k+!4=}qkT6wxS zhIsHEoz~5D$biQ+{O14vo2uB^^DZCRx+^j9Non!4ZNfR{zh|w@4PS3wCLH=__08FA zb!P%@Ms7*p8~nl8BXqxL-Rqh1AF`tNKPzYa_iJm-?&g);PlaP@Pm0utcGXFp`?AT# zL903@Lx(Bop8oDr$Lk)IeByaw`JFML( z2~hje#xv{X72^X_UFI}~d~Xf2d};fxPxVmD3x}VpDs8`cP5zhPDeMuk)@yZ*xh2E= nj+j*Y%yQAqx}h6x?%ARLVc{MJn}sR;pfbwS)z4*}Q$iB}+8TR$ literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_3_.png b/non_catalog_apps/tarot/images/major_3_.png new file mode 100644 index 0000000000000000000000000000000000000000..b1e7e25dd6de12dfe539f185772b4e0d9ff0deb3 GIT binary patch literal 1989 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 literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_5.png b/non_catalog_apps/tarot/images/major_5.png new file mode 100644 index 0000000000000000000000000000000000000000..5d7b49ce1d086082a2e1de3208d9167d02214ece GIT binary patch literal 1754 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}GKNru}~P+F7&wk0K5KQ$*cH#M)MSl>|3P#>GV zlFT%O3-gMh!2t{yeUJ=Ln*mmBo&_bzCcuz#tpK_Q>OY`Elfm{Dm!#+;DbP1EFtE@y zFw!-$)Q9^I=zN=$WUG?QlAKg!!;dQcGLWP(E0Dkm{7-BzhWHzhSK zu{5Vd$u2iBE59h-)J7ko2vsvg6xB={eJs}7fIMv#8I)R_pHm77b~{63BO7o~pok(O z0HPxTs}5vQbR7X1`6cMU^3c4@5<8dyXu?Rk zkRr#*v8bdxzbHEd91-wP#Hj*m3M534(kCSGgF_#f`t7)E^x-+ljw{*8_W>~H@_V{C zhIsI9ofOD-Sb@j+^p)T7m8&Nz?bPF2nDmF?V5MQ>x4mxJZ*SP@yC)CziG`C`H`6zqlYG#nJnyBBP4SVVMzOcV{8HLwo;&TTJ0Q8} z(GBZfvAtW5s>=wr*?>I4n(K-G0qXQnR__)){_pEDLxVb=vNh)D(p`Em5 u%;d!l$L`i~zEjYvJ9M`1_+_RC{}>qGMY-B0to#oucsyPGT-G@yGywn~yI{fq literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_5_.png b/non_catalog_apps/tarot/images/major_5_.png new file mode 100644 index 0000000000000000000000000000000000000000..dd24336da24dfec81e52bc335ce67788a9953860 GIT binary patch literal 1915 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}F<$xK7olvfP(7SMzGAQ^o_Jp+Ag+EObracBd{ z;MA6q4EI$*X;BW?PbtazsX3{+sd**EKz)W-t@A7>Nj3onuxka-8_-|@`Y#!5KygWm zK9T}`BLf2qT>~RsBTIdFumF8+1M-knWKe2xeoiSUXzUD)jcmZ)L=i;<5<~|=Lug)R zi5*M}nlQSq2!uS6J;S&3T(l3Aeew+hIt zNX?0G$pnUKG03Mz#y0v`C9rCYL}&zs5JDr81d_&-WUG?QlAKgZhMUb?MPg>Fh}T4HHViIQDzVpe`pys3>oL=mcHh$yO=Hu_ksw?Rq{ zR*pp_<@rU~Az&xM&Bv(%>M@92NEr!|OTq2}W>Y&Z8+~||x8t%Z3@8T{G3=f$jv*er zYo{ILYc}9|VpZ?blmv9a#V8eq%g5|N2U% zoP)a`Z+^&cJ{GFDDrD_eU>q6!>Jy~xyw~4!h zcI>)*ht)Z}FIC)&d1W!zzfS(==hhhe+Pr*Xqg{0O_%BX5>)ipblKv*^1RiiIotn8K zwdTN2rohIVbyqW_yxA`NosrJA!297;<=lXmr#5CRw7OE8EAshDrN}#*+XcH)OJ?0H zIAE3VBDz4N@8b literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_6.png b/non_catalog_apps/tarot/images/major_6.png new file mode 100644 index 0000000000000000000000000000000000000000..6223bf62d466ab5fa2d127a02787c715d8882336 GIT binary patch literal 1778 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}GKNru}~P+F7&wk0K5KQ$*cH#M)MSl>|3P#>GV zlFT%O3-gMh!2t{yeUJ=Ln*mmBo&_bzCcuz#tpK_Q>OY`Elfm{Dm!#+;DbP1EFtE@y zFw!-$)Q9^I=zN=$WUG?QlAKg!!;dQcGLWP(E0Dkm{7-BzhWHzhSK zu{5Vd$u2iBE59h-%tjxg2vsvg6xB={eJs}7fIMv#8I)R_pHm77b~{63BO7o~pok(O z0HPxTs}5vQbR7X1`6cMU^3c4@5<8dyXu?Rk zkRr#*v8bdxzbHEd91-wP#Hj*m3M534(kCSGgF_#f`t7)E^x-+lj_XH`nGrDOs(ZRP zhIsI>(hx>bCOZAx#A)SETqP_m=h?KKmNf_I3! z8QgcdUiR=}t`1XMpNHJvNyQ2x=aYV&d&&?{vUpF?y1>aRg5RCr*~RFwz*YIJtk+~7 zo!rNF7Bbi_Z<>1bz}^kd-K6gHn_T+a>w0qgHRT;{$9@<&_dj5$=FK~}Gi83|wFNsb zR0KvkmU#14_VdQDD{mCvBrloqKv{7^+!w)xnGa?%Je*tc+G%xf-&M)*gOC0(d|Fr+ UuA#F9R6;U%y85}Sb4q9e0Cc-=BLDyZ literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_6_.png b/non_catalog_apps/tarot/images/major_6_.png new file mode 100644 index 0000000000000000000000000000000000000000..9efa5d75008f4cd843d319702510eecc5429da37 GIT binary patch literal 1951 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}F<$xK7olvfP(7SMzGAQ^o_Jp+Ag+EObracBd{ z;MA6q4EI$*X;BW?PbtazsX3{+sd**EKz)W-t@A7>Nj3onuxka-8_-|@`Y#!5KygWm zK9T}`BLf2qT>~RsBTIdFumF8+1M-knWKe2xeoiSUXzUD)jcmZ)L=i;<5<~|=Lug)R zi5*M}nlQSq2!uS6J;S&3T(l3Aeew+hIt zNX?0G$pnUKG03Mz#y0v`C9rCYL}&zs5JDr81d_&-WUG?QlAKgZhMUb?MPg>Fh}T4HHViIQDzVpe`pyqS$YL=mcHh$yO=Hu_ksw?Rq{ zR*pp_<@rU~Az&xM&Bv(%>M@92NEr!|OTq2}W>Y&Z8+~||x8vHh+3zK=h|%_RaSZX` z-8$_e-(dv~*VmW+|9_gh{bc02u8CRcn+`NoFSyY@?fdsBL4C{5i&uAO{k#0enR&n5 za;Xm{|DV5Gb8`EIgW(7HQcpdMT9o9H7rH#&B*fg(N%Zo8+D~hjGD1Op7r3JfqtW#OA0){=UwC@${ VCmN{Kd4_{ZPfu4rmvv4FO#nj4st^DG literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_7.png b/non_catalog_apps/tarot/images/major_7.png new file mode 100644 index 0000000000000000000000000000000000000000..fbbeda1517da2e0d9a7e35191e447924eb59e2a0 GIT binary patch literal 1763 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}GKNru}~P+F7&wk0K5KQ$*cH#M)MSl>|3P#>GV zlFT%O3-gMh!2t{yeUJ=Ln*mmBo&_bzCcuz#tpK_Q>OY`Elfm{Dm!#+;DbP1EFtE@y zFw!-$)Q9^I=zN=$WUG?QlAKg!!;dQcGLWP(E0Dkm{7-BzhWHzhSK zu{5Vd$u2iBE59h-+(sXw2vsvg6xB={eJs}7fIMv#8I)R_pHm77b~{63BO7o~pok(O z0HPxTs}5vQbR7X1`6cMU^3c4@5<8dyXu?Rk zkRr#*v8bdxzbHEd91-wP#Hj*m3M534(kCSGgF_#f`t7)E^x-+lj>{ra))|;{B|Kdm zLp*rzPP)x^*nq=%_R9bNPe;!^C8QW|dBx;qPZKqd$mlKJ+kZLg_B=cGGG@^~%Wq0^ z)oE(&KJ{*O1?PUQuzaC=>E&B?80}hrZqMP+>ecV9nZl#OI5#rLzH7b1Gd1F+ngvsi z`n@#8d+&2!wB>fPw5*&Rom$E)!|##cFCrrP@bQ5e4_YD(YdJn7+_=Xsdyd8a?sK-A zEMIP0HwR5Vqd6L1o>Of5{bF1n2CY)homO--G|upRnnN z7I*#qwURHWVyRI``Ob7h&dd5zR6J*% zaLB<9&BM8_SKmi}unzqn_Vj9D!1l#gGq!3(>^=CGVWG`*i+A6}sz4=>r>mdKI;Vst E0Jf)QNdN!< literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_7_.png b/non_catalog_apps/tarot/images/major_7_.png new file mode 100644 index 0000000000000000000000000000000000000000..ca27a423b3c9fabbf1574f8484b75bc8fbf7a773 GIT binary patch literal 1926 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}F<$xK7olvfP(7SMzGAQ^o_Jp+Ag+EObracBd{ z;MA6q4EI$*X;BW?PbtazsX3{+sd**EKz)W-t@A7>Nj3onuxka-8_-|@`Y#!5KygWm zK9T}`BLf2qT>~RsBTIdFumF8+1M-knWKe2xeoiSUXzUD)jcmZ)L=i;<5<~|=Lug)R zi5*M}nlQSq2!uS6J;S&3T(l3Aeew+hIt zNX?0G$pnUKG03Mz#y0v`C9rCYL}&zs5JDr81d_&-WUG?QlAKgZhMUb?MPg>Fh}T4HHViIQDzVpe`pyt$1&L=mcHh$yO=Hu_ksw?Rq{ zR*pp_<@rU~Az&xM&Bv(%>M@92NEr!|OTq2}W>Y&Z8+~||x8pkXX?HTPh!OI1aSZX` zy*tg3@2~<7i}Td~^*hhH$)1#u_HbFcBBm$N_8vp~l<$UKnzvsSCYT2vjX!%Y<;T`J zSqWNkQ6|@FZV}&vaMyW3`=xnpw7vusareK{+QFjL)56dxCv!ElAU@%9 zj+~_9>_f`x_e|rt&Kwu%Gbo<6Hh8&3i+j95kx#Rt%)_}qju)Jp&i$qG{f@TdkLJs7 z$eCMvRHV;Y``hOis*z{&gwHCkh-L05USv{da!ycrOTx7bhjlMrZwWiNSgAA3EoG6V z*nNefC27XH*!&*$++Jh2^?5z_$yXIt@|HU;hm;4zX0SZ$6kNLT^NO~uiZY6U3H3AI t{H&0C$GG>;a{EQU->83+ajSk*#}GcH)yL)P7YFMg{vd$@?2>_Aclg|JE literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_8.png b/non_catalog_apps/tarot/images/major_8.png new file mode 100644 index 0000000000000000000000000000000000000000..34e6ec37fe94c11d59ab2f4df0b69b87a3ee12f9 GIT binary patch literal 1777 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}GKNru}~P+F7&wk0K5KQ$*cH#M)MSl>|3P#>GV zlFT%O3-gMh!2t{yeUJ=Ln*mmBo&_bzCcuz#tpK_Q>OY`Elfm{Dm!#+;DbP1EFtE@y zFw!-$)Q9^I=zN=$WUG?QlAKg!!;dQcGLWP(E0Dkm{7-BzhWHzhSK zu{5Vd$u2iBE59h-!bTsW2vsvg6xB={eJs}7fIMv#8I)R_pHm77b~{63BO7o~pok(O z0HPxTs}5vQbR7X1`6cMU^3c4@5<8dyXu?Rk zkRr#*v8bdxzbHEd91-wP#Hj*m3M534(kCSGgF_#f`t7)E^x-+lj%!hDvlKArs(HFN zhIsI9oy5)8Y{29E^2p!ydlDy1;KB7K@@#?gfrVlyWC-AXpo|v1gW4V3i`KFmB-MbHJ)+O5?4>~(jH|=E7 zRx7y|xlj3e9?ZLch_U19!M4zw{O>>BZ(UvS?M`d>+VC>n1BbSj&iSeA@OR70yoXvT zOYd9_pR4~tCt!8({#%^k_Bqe3!yS2g?q7K&ckn~3)^ZEsOVi&@wQFS#V0GDXdFqFW zEPOo`+~u5A2}kbfi5%O(ap>qL8Pl8P+lzQ-F)HVAt?P60W)rQ~9dK>F) Sx3>v_3nWihKbLh*2~7Zqqj2H? literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_8_.png b/non_catalog_apps/tarot/images/major_8_.png new file mode 100644 index 0000000000000000000000000000000000000000..0cf9d18251b3ed32158455d8b1d5a2e57f8cd7ee GIT binary patch literal 1937 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}F<$xK7olvfP(7SMzGAQ^o_Jp+Ag+EObracBd{ z;MA6q4EI$*X;BW?PbtazsX3{+sd**EKz)W-t@A7>Nj3onuxka-8_-|@`Y#!5KygWm zK9T}`BLf2qT>~RsBTIdFumF8+1M-knWKe2xeoiSUXzUD)jcmZ)L=i;<5<~|=Lug)R zi5*M}nlQSq2!uS6J;S&3T(l3Aeew+hIt zNX?0G$pnUKG03Mz#y0v`C9rCYL}&zs5JDr81d_&-WUG?QlAKgZhMUb?MPg>Fh}T4HHViIQDzVpe`pyoHTEL=mcHh$yO=Hu_ksw?Rq{ zR*pp_<@rU~Az&xM&Bv(%>M@92NEr!|OTq2}W>Y&Z8+~||x8vejebo(E#K?NOIEHxe zZk-y**K8o*?0NL>`a4M~%EmKQIj78T>HM4K8F>49MO60f+vgkaIdknhT#A?rO) z{lAd&jBAtYf%4Ei{-5(0S9D&>dp5B^^6+Zum;=m!7VEF6*2U FngDw!n}z@Y literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/major_9.png b/non_catalog_apps/tarot/images/major_9.png new file mode 100644 index 0000000000000000000000000000000000000000..4f9290c6328c908e5b6788c5fc497a66d2761e29 GIT binary patch literal 1738 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 literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tarot/images/tarot_back.png b/non_catalog_apps/tarot/images/tarot_back.png new file mode 100644 index 0000000000000000000000000000000000000000..4e77eb13a7e995a79a8ed6b71fd420fb9db33d2a GIT binary patch literal 1774 zcmeAS@N?(olHy`uVBq!ia0vp^;y|px!3HFMhCbfPz`$6V>FgYk?dXKPpkds&$V9davF|l;QUhl&JB1ipK2VJo0;FFax>U6$xiL0zILtDhvAcS>w@T@w{ z+!__lphDqr%^&g+2O|qMbc7TX76`bo3*Mb$rMV-c;@-g9HKAD^QUUWuo!8!d~x15+Q<}RFk z_4cg_76~bayjMP^A?~jhetTAQ;5Vni45qgC8k-ZJ9a1c>uIG7C{qRpR&j(qivZ4nJ zi1>mq}FfdWk9dNvV1jxdk9y3^o;3KxS@gNuokUZcbjY zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fw-;8Gf=YQQczH^DN0GR3UYCSY6tRc zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w; z$}A|!%+FH*nVXoDUs__Tqy(}E4j}GKNru}~P+F7&wk0K5KQ$*cH#M)MSl>|3P#>GV zlFT%O3-gMh!2t{yeUJ=Ln*mmBo&_bzCcuz#tpK_Q>OY`Elfm{Dm!#+;DbP1EFtE@y zFw!-$)Q9^I=zN=$WUG?QlAKg!!;dQcGLWP(E0Dkm{7-BzhWHzhSK zu{5Vd$*v@^D8D2=DKRF76o1$eqWk`qm*(~T(MRJJH09^` zC3W6!IpaEc`wK5PC!@0llgmVxW2cRX%-mX$^B+!I^j_0lSaF+wcie3UX&NLU|!yd zox5hfl#Y=-Ba$BV>74a>nKym&%kNnUYQH;a{eI5w-H(h`De9M;+u!QMW$SW0bp0-Y zbxdDGMUKXux2T(f@--+#~L;&^(&glz{-luuV>PI=t0sr9~Yfpw5i z$8}@A_? +#include +#include +#include +#include +#include +#include +#include + +#define TAG "tarot" + +/* generated by fbt from .png files in images folder */ +#include + +/* ids for all scenes used by the app */ +typedef enum { + AppScene_MainMenu, + AppScene_About, + AppScene_Game, + AppScene_count +} AppScene; + +/* ids for the 2 types of view used by the app */ +typedef enum { AppView_Submenu, AppView_Popup, AppView_Widget } AppView; + +/* the app context struct */ +typedef struct { + SceneManager* scene_manager; + ViewDispatcher* view_dispatcher; + Submenu* submenu; // Submenu for the main menu + Popup* popup; // Popup for about + Widget* widget; // Widget for game +} App; + +/* all custom events */ +typedef enum { AppEvent_ShowGame, AppEvent_ShowAbout } AppEvent; + +/* main menu scene */ + +/* indices for menu items */ +typedef enum { AppMenuSelection_Run, AppMenuSelection_About } AppMenuSelection; + +/* main menu callback - sends a custom event to the scene manager based on the menu selection */ +void tarot_app_menu_callback_main_menu(void* context, uint32_t index) { + FURI_LOG_T(TAG, "tarot_app_menu_callback_main_menu"); + App* app = context; + switch(index) { + case AppMenuSelection_Run: + scene_manager_handle_custom_event(app->scene_manager, AppEvent_ShowGame); + break; + case AppMenuSelection_About: + scene_manager_handle_custom_event(app->scene_manager, AppEvent_ShowAbout); + break; + } +} + +/* resets the submenu, gives it content, callbacks and selection enums */ +void tarot_app_scene_on_enter_main_menu(void* context) { + FURI_LOG_T(TAG, "tarot_app_scene_on_enter_main_menu"); + App* app = context; + submenu_reset(app->submenu); + + submenu_add_item( + app->submenu, + "Run", + AppMenuSelection_Run, + tarot_app_menu_callback_main_menu, + app); + submenu_add_item( + app->submenu, + "About", + AppMenuSelection_About, + tarot_app_menu_callback_main_menu, + app); + view_dispatcher_switch_to_view(app->view_dispatcher, AppView_Submenu); +} + +/* main menu event handler - switches scene based on the event */ +bool tarot_app_scene_on_event_main_menu(void* context, SceneManagerEvent event) { + FURI_LOG_T(TAG, "tarot_app_scene_on_event_main_menu"); + App* app = context; + bool consumed = false; + switch(event.type) { + case SceneManagerEventTypeCustom: + switch(event.event) { + case AppEvent_ShowGame: + scene_manager_next_scene(app->scene_manager, AppScene_Game); + consumed = true; + break; + case AppEvent_ShowAbout: + scene_manager_next_scene(app->scene_manager, AppScene_About); + consumed = true; + break; + } + break; + default: // eg. SceneManagerEventTypeBack, SceneManagerEventTypeTick + consumed = false; + break; + } + return consumed; +} + +void tarot_app_scene_on_exit_main_menu(void* context) { + FURI_LOG_T(TAG, "tarot_app_scene_on_exit_main_menu"); + App* app = context; + submenu_reset(app->submenu); +} + +/* About scene */ + +void tarot_app_scene_on_enter_about(void* context) { + FURI_LOG_T(TAG, "tarot_app_scene_on_enter_about"); + App* app = context; + popup_reset(app->popup); + popup_set_context(app->popup, app); + popup_set_header(app->popup, "About", 64, 1, AlignCenter, AlignTop); + popup_set_icon(app->popup, 16, 64-13, &I_github_icon); + popup_set_text(app->popup, "\n\nCode: pionaiki\nArt: tihyltew\n\n /pionaiki/fz-tarot", 64, 0, AlignCenter, AlignTop); + view_dispatcher_switch_to_view(app->view_dispatcher, AppView_Popup); +} + +bool tarot_app_scene_on_event_about(void* context, SceneManagerEvent event) { + FURI_LOG_T(TAG, "tarot_app_scene_on_event_about"); + UNUSED(context); + UNUSED(event); + return false; // don't handle any events +} + +void tarot_app_scene_on_exit_about(void* context) { + FURI_LOG_T(TAG, "tarot_app_scene_on_exit_about"); + App* app = context; + popup_reset(app->popup); +} + +/* Game scene */ + +/* ###### */ + +const int card_x = 23; +const int card_y = 32; +const int card_number = 22; + +int card_selected = 0; + +struct Card { + const char name[20]; + const Icon* icon; +}; + +const struct Card card[] = { + {"The Fool", &I_major_0}, + {"The Magician", &I_major_1}, + {"The High Priestess", &I_major_2}, + {"The Empress", &I_major_3}, + {"The Emperor", &I_major_4}, + {"The Hierophant", &I_major_5}, + {"The Lovers", &I_major_6}, + {"The Chariot", &I_major_7}, + {"Strength", &I_major_8}, + {"The Hermit", &I_major_9}, + {"Wheel of Fortune", &I_major_10}, + {"Justice", &I_major_11}, + {"The Hanged Man", &I_major_12}, + {"Death", &I_major_13}, + {"Temperance", &I_major_14}, + {"The Devil", &I_major_15}, + {"The Tower", &I_major_16}, + {"The Star", &I_major_17}, + {"The Moon", &I_major_18}, + {"The Sun", &I_major_19}, + {"Judgement", &I_major_20}, + {"The World", &I_major_21}, + {"The Fool", &I_major_0_}, + {"The Magician", &I_major_1_}, + {"The High Priestess", &I_major_2_}, + {"The Empress", &I_major_3_}, + {"The Emperor", &I_major_4_}, + {"The Hierophant", &I_major_5_}, + {"The Lovers", &I_major_6_}, + {"The Chariot", &I_major_7_}, + {"Strength", &I_major_8_}, + {"The Hermit", &I_major_9_}, + {"Wheel of Fortune", &I_major_10_}, + {"Justice", &I_major_11_}, + {"The Hanged Man", &I_major_12_}, + {"Death", &I_major_13_}, + {"Temperance", &I_major_14_}, + {"The Devil", &I_major_15_}, + {"The Tower", &I_major_16_}, + {"The Star", &I_major_17_}, + {"The Moon", &I_major_18_}, + {"The Sun", &I_major_19_}, + {"Judgement", &I_major_20_}, + {"The World", &I_major_21_} +}; + +static uint16_t unbiased_rand (uint16_t max) { + uint16_t remainder = RAND_MAX % max; + uint16_t x; + do { + x = rand(); + } while (x >= RAND_MAX - remainder); + return x % max; +} + +struct Spread { + int card[3]; + bool selected[3]; +}; + +struct Spread spread; + +void draw_tarot(void* context) { + App* app = context; + widget_reset(app->widget); + + // Set the cursor to the selected card + spread.selected[0] = 0; + spread.selected[1] = 0; + spread.selected[2] = 0; + spread.selected[card_selected] = 1; + + // Draw cards + widget_add_icon_element(app->widget, (128-card_x)/2 - 32, 10 - 2*spread.selected[0], card[spread.card[0]].icon); + widget_add_icon_element(app->widget, (128-card_x)/2, 10 - 2*spread.selected[1], card[spread.card[1]].icon); + widget_add_icon_element(app->widget, (128-card_x)/2 + 32, 10 - 2*spread.selected[2], card[spread.card[2]].icon); + + // Draw cursor + widget_add_icon_element(app->widget, (128-card_x)/2 - 34 + card_x/2 + card_selected*32, 41, &I_cursor); + + // Draw card name + widget_add_string_element(app->widget, 64, 60, AlignCenter, AlignBottom, FontPrimary, card[spread.card[card_selected]].name); +} + +static bool widget_input_callback(InputEvent* input_event, void* context) { + App* app = context; + bool consumed = false; + if(input_event->type == InputTypeShort) { + switch(input_event->key) { + case InputKeyRight: + card_selected++; + if (card_selected > 2) { + card_selected = 0; + } + consumed = true; + break; + case InputKeyLeft: + card_selected--; + if (card_selected < 0) { + card_selected = 2; + } + consumed = true; + break; + case InputKeyUp: + // UP + //consumed = true; + break; + case InputKeyDown: + // DOWN + //consumed = true; + break; + default: + consumed = false; + break; + } + } + if(consumed) draw_tarot(app); + return consumed; +} + +void tarot_app_scene_on_enter_game(void* context) { + FURI_LOG_T(TAG, "tarot_app_scene_on_enter_game"); + App* app = context; + + // Set random spread + spread.card[0] = unbiased_rand(card_number); + spread.card[1] = unbiased_rand(card_number); + while (spread.card[1] == spread.card[0]) { + spread.card[1] = unbiased_rand(card_number); + }; + spread.card[2] = unbiased_rand(card_number); + while (spread.card[2] == spread.card[0] || spread.card[2] == spread.card[1]) { + spread.card[2] = unbiased_rand(card_number); + } + + // Upside down card option + if (0/*settings.upside_down*/) { + spread.card[0] += card_number*unbiased_rand(2); + spread.card[1] += card_number*unbiased_rand(2); + spread.card[2] += card_number*unbiased_rand(2); + } + + draw_tarot(app); + + view_set_context(widget_get_view(app->widget), app); + + view_set_input_callback(widget_get_view(app->widget), widget_input_callback); + + view_dispatcher_switch_to_view(app->view_dispatcher, AppView_Widget); +} + +bool tarot_app_scene_on_event_game(void* context, SceneManagerEvent event) { + FURI_LOG_T(TAG, "tarot_app_scene_on_event_game"); + UNUSED(context); + UNUSED(event); + return false; // don't handle any events +} + +void tarot_app_scene_on_exit_game(void* context) { + FURI_LOG_T(TAG, "tarot_app_scene_on_exit_game"); + App* app = context; + widget_reset(app->widget); +} + +/* ###### */ + +/* collection of all scene on_enter handlers - in the same order as their enum */ +void (*const tarot_app_scene_on_enter_handlers[])(void*) = { + tarot_app_scene_on_enter_main_menu, + tarot_app_scene_on_enter_about, + tarot_app_scene_on_enter_game}; + +/* collection of all scene on event handlers - in the same order as their enum */ +bool (*const tarot_app_scene_on_event_handlers[])(void*, SceneManagerEvent) = { + tarot_app_scene_on_event_main_menu, + tarot_app_scene_on_event_about, + tarot_app_scene_on_event_game}; + +/* collection of all scene on exit handlers - in the same order as their enum */ +void (*const tarot_app_scene_on_exit_handlers[])(void*) = { + tarot_app_scene_on_exit_main_menu, + tarot_app_scene_on_exit_about, + tarot_app_scene_on_exit_game}; + +/* collection of all on_enter, on_event, on_exit handlers */ +const SceneManagerHandlers tarot_app_scene_event_handlers = { + .on_enter_handlers = tarot_app_scene_on_enter_handlers, + .on_event_handlers = tarot_app_scene_on_event_handlers, + .on_exit_handlers = tarot_app_scene_on_exit_handlers, + .scene_num = AppScene_count}; + +/* custom event handler - passes the event to the scene manager */ +bool tarot_app_scene_manager_custom_event_callback(void* context, uint32_t custom_event) { + FURI_LOG_T(TAG, "tarot_app_scene_manager_custom_event_callback"); + furi_assert(context); + App* app = context; + return scene_manager_handle_custom_event(app->scene_manager, custom_event); +} + +/* navigation event handler - passes the event to the scene manager */ +bool tarot_app_scene_manager_navigation_event_callback(void* context) { + FURI_LOG_T(TAG, "tarot_app_scene_manager_navigation_event_callback"); + furi_assert(context); + App* app = context; + return scene_manager_handle_back_event(app->scene_manager); +} + +/* initialise the scene manager with all handlers */ +void tarot_app_scene_manager_init(App* app) { + FURI_LOG_T(TAG, "tarot_app_scene_manager_init"); + app->scene_manager = scene_manager_alloc(&tarot_app_scene_event_handlers, app); +} + +/* initialise the views, and initialise the view dispatcher with all views */ +void tarot_app_view_dispatcher_init(App* app) { + FURI_LOG_T(TAG, "tarot_app_view_dispatcher_init"); + app->view_dispatcher = view_dispatcher_alloc(); + view_dispatcher_enable_queue(app->view_dispatcher); + + // allocate each view + FURI_LOG_D(TAG, "tarot_app_view_dispatcher_init allocating views"); + app->submenu = submenu_alloc(); + app->popup = popup_alloc(); + app->widget = widget_alloc(); + + // assign callback that pass events from views to the scene manager + FURI_LOG_D(TAG, "tarot_app_view_dispatcher_init setting callbacks"); + view_dispatcher_set_event_callback_context(app->view_dispatcher, app); + view_dispatcher_set_custom_event_callback( + app->view_dispatcher, tarot_app_scene_manager_custom_event_callback); + view_dispatcher_set_navigation_event_callback( + app->view_dispatcher, tarot_app_scene_manager_navigation_event_callback); + + // add views to the dispatcher, indexed by their enum value + FURI_LOG_D(TAG, "tarot_app_view_dispatcher_init adding view menu"); + view_dispatcher_add_view(app->view_dispatcher, AppView_Submenu, submenu_get_view(app->submenu)); + + FURI_LOG_D(TAG, "tarot_app_view_dispatcher_init adding view popup"); + view_dispatcher_add_view(app->view_dispatcher, AppView_Popup, popup_get_view(app->popup)); + + FURI_LOG_D(TAG, "tarot_app_view_dispatcher_init adding view widget"); + view_dispatcher_add_view(app->view_dispatcher, AppView_Widget, widget_get_view(app->widget)); +} + +/* initialise app data, scene manager, and view dispatcher */ +App* tarot_app_init() { + FURI_LOG_T(TAG, "tarot_app_init"); + App* app = malloc(sizeof(App)); + tarot_app_scene_manager_init(app); + tarot_app_view_dispatcher_init(app); + return app; +} + +/* free all app data, scene manager, and view dispatcher */ +void tarot_app_free(App* app) { + FURI_LOG_T(TAG, "tarot_app_free"); + scene_manager_free(app->scene_manager); + view_dispatcher_remove_view(app->view_dispatcher, AppView_Submenu); + view_dispatcher_remove_view(app->view_dispatcher, AppView_Popup); + view_dispatcher_remove_view(app->view_dispatcher, AppView_Widget); + view_dispatcher_free(app->view_dispatcher); + submenu_free(app->submenu); + popup_free(app->popup); + widget_free(app->widget); + free(app); +} + +/* go to trace log level in the dev environment */ +void tarot_app_set_log_level() { +#ifdef FURI_DEBUG + furi_log_set_level(FuriLogLevelTrace); +#else + furi_log_set_level(FuriLogLevelInfo); +#endif +} + +/* entrypoint */ +int32_t tarot_app(void* p) { + UNUSED(p); + tarot_app_set_log_level(); + + // create the app context struct, scene manager, and view dispatcher + FURI_LOG_I(TAG, "Tarot app starting..."); + App* app = tarot_app_init(); + + // set the scene and launch the main loop + Gui* gui = furi_record_open(RECORD_GUI); + view_dispatcher_attach_to_gui(app->view_dispatcher, gui, ViewDispatcherTypeFullscreen); + scene_manager_next_scene(app->scene_manager, AppScene_MainMenu); + FURI_LOG_D(TAG, "Starting dispatcher..."); + view_dispatcher_run(app->view_dispatcher); + + // free all memory + FURI_LOG_I(TAG, "Tarot app finishing..."); + furi_record_close(RECORD_GUI); + tarot_app_free(app); + return 0; +} diff --git a/non_catalog_apps/tarot/tarot.png b/non_catalog_apps/tarot/tarot.png new file mode 100644 index 0000000000000000000000000000000000000000..4326b87af584716a713b1851e32ac53652d6d7ac GIT binary patch literal 1564 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=`2Jfw45x**PHF+1)umC%-7TATc@B zC9}97C$TcXn1MlKV(Emv-iHH3j{2_-x?t78Co5yr>3ro9S6N|(wuq}i2q`FvqvqL5J`hvTaWJBnY|@vr@TGB@|V=#1QgbNaV#IWb$zT{!vb z?OPQr5>gC#uY62H++QvH_N?f@Z%%_5Ol|KqHYYwiq*z{E&-0@C;h$ul53)>UQ$Md) zKKE9tb$+AvUv_cLtUbYOj;Dd~P>~wpnda-upao=eFt9SRF)#yJj0{XbLW+SE%w}Nl zVw8rngBUdsYT7dySfFa6fHVlS05Kz+W?H}mSHZP_8NmiAwKHEZ4@hwqctjR6Fo^hq zFyoX{z4{Cc%te_Y5hW46K32*3xq68y`AMmI6}bft&@)i7<5EyiuqjGOvkG!?gK7uzY?U%f zN(!v>^~=l4^~#O)@{7{-4J|D#^$m>ljf`}GDs+o0^GXscbn}XpA%?)raY-#sF3Kz@ z$;{7F0GXSZlwVq6tE2?72o50bOi6~@Q&3uz1GXh4SwA%=H8(Y{q*&ij&rlzmzLLx| zgbVYEp}_$R7=4foP@4f(ZJq@s$tJ*%a;*Tm2kJkdLzBVw7MG;xBPq}~GBB{vH89dO zvebwB59oZGlw_-t%#xf`aKOR+0}esQoDx(~ka|!MV^%6U^|N1o2M1sX2bTFx!o v=XA-2`LpJU*ar(7xWZ@1C{J(H<`njxgN@xNA&9eO< literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tone_gen/.gitignore b/non_catalog_apps/tone_gen/.gitignore new file mode 100644 index 00000000000..81a8981f739 --- /dev/null +++ b/non_catalog_apps/tone_gen/.gitignore @@ -0,0 +1,6 @@ +dist/* +.vscode +.clang-format +.editorconfig +.env +.ufbt diff --git a/non_catalog_apps/tone_gen/LICENSE b/non_catalog_apps/tone_gen/LICENSE new file mode 100644 index 00000000000..1620a9b2996 --- /dev/null +++ b/non_catalog_apps/tone_gen/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2023 Gerald McAlister + +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/non_catalog_apps/tone_gen/README.MD b/non_catalog_apps/tone_gen/README.MD new file mode 100644 index 00000000000..d5f73ccd7c3 --- /dev/null +++ b/non_catalog_apps/tone_gen/README.MD @@ -0,0 +1,23 @@ +# Tone Generator + +This repo contains a simple application for the Flipper Zero that can generate a steady tone with a variety of user chosen settings. It's designed to be a simple application showcasing how to develop apps for the Flipper Zero, and get my hands dirty with doing so. It is written entirely in C, and is very simple in nature by design. + +## Dependencies + +This project depends on [uFBT](https://github.com/flipperdevices/flipperzero-ufbt) for building. It is also recommended to install VSCode for ease of development, as well as [minicom](https://en.wikipedia.org/wiki/Minicom) for debugging (`brew install minicom`). + +## App Source File Structure + +The application is structured such that each scene can be self contained, with the sharing of data between scenes done via the app context. All of the scenes can be found with their corresponding source and header files in the `src/scenes` directory. The scenes do as follows: + +- **Starting Scene**: The scene where the application starts. This has the main menu options that users see when they start the app. +- **Playback Scene**: The scene where the sound is played. Animates a waveform with the *approximate* shape of the sound being played. +- **Settings Scene**: The scene where users can configure the tone's properties. + +Note as well that the app context file is generic, and designed in such as way that it should not need to be updated for things specific to the application. This allows for an easier time to allow scenes to self manage, insteaed of having somewhere else that centrally manages everything. + +## Helpful Commands + +- `ufbt`: Builds the project +- `ufbt launch`: Launches the project on a device. Make sure no other applications (including qFlipper) are connected to the device. +- `minicom -D /dev/tty.X`: Replace `X` with the name of your flipper device when connected and then use this to start a command line interface to your flipper device. From there, you can run `log debug` to see debug logs from the app while it is running. diff --git a/non_catalog_apps/tone_gen/application.fam b/non_catalog_apps/tone_gen/application.fam new file mode 100644 index 00000000000..8c5dcfa9829 --- /dev/null +++ b/non_catalog_apps/tone_gen/application.fam @@ -0,0 +1,17 @@ +# For details & more options, see documentation/AppManifests.md in firmware repo + +App( + appid="tone_gen", # Must be unique + name="Tone Generator", # Displayed in menus + apptype=FlipperAppType.EXTERNAL, + entry_point="tone_gen_app", + stack_size=2 * 1024, + fap_category="Tools", + fap_version="1.0", + fap_icon="tone_gen.png", # 10x10 1-bit PNG + fap_description="A simple app to generate sound tones.", + fap_author="Gerald McAlister", + fap_weburl="https://github.com/GEMISIS/tone_gen", + fap_icon_assets="images", # Image assets to compile for this application + sources=["src/*.c", "src/scenes/*.c", "src/system/*.c", "src/utils/*.c"], +) diff --git a/non_catalog_apps/tone_gen/images/.gitkeep b/non_catalog_apps/tone_gen/images/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d diff --git a/non_catalog_apps/tone_gen/images/play_button.gif b/non_catalog_apps/tone_gen/images/play_button.gif new file mode 100644 index 0000000000000000000000000000000000000000..29e14a233199e1c5639bac43ffa35b3651b5542b GIT binary patch literal 215 zcmZ?wbhEHb)aUvv;eG%8ATN?vrts=_4Kb~EX>4Tx04R}tkv&MmKpe$iQ>7vm2aAXZW~fefQ4z;lg(6f4wL+^7CYOFelZGV4 z#ZhoAIQX$xb#QUk)xlK|1V2DrU7QqMq{ROvg%&X$9QWhhy~o`x##3oQp0CJTqcu((}X-VzJo4N(Zx&sS!^TM^#Oyd?D+x z%6W^kR;jVpJ^2g6d3|M>>oiA@#3Gg;L4<-D%Ba9bj8>f#3u)R<`1prizeFyDTxBqF zET9Svvg-%`gWug+g{es|DVzYhUmWLS3<&K4&AQ`!A3IL-1PDF@S9;rDZ2+^Mq}SV8 z^a$wR1}?7Knz9F6?f^qihHT2N6r?E>3c&jreNzq?xCMIGyxv;-IDG&z)K%&RI5-5x zihA}?-*UzHU{uin000SaNLh0L04^f{04^f|c%?sf00007bV*G` z2j~F-0R#_54$n9M000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0000x zNklEX>4Tx04R}tkv&MmKpe$iQ>7vm2aAXZW~fefQ4z;lg(6f4wL+^7CYOFelZGV4 z#ZhoAIQX$xb#QUk)xlK|1V2DrU7QqMq{ROvg%&X$9QWhhy~o`x##3oQp0CJTqcu((}X-VzJo4N(Zx&sS!^TM^#Oyd?D+x z%6W^kR;jVpJ^2g6d3|M>>oiA@#3Gg;L4<-D%Ba9bj8>f#3u)R<`1prizeFyDTxBqF zET9Svvg-%`gWug+g{es|DVzYhUmWLS3<&K4&AQ`!A3IL-1PDF@S9;rDZ2+^Mq}SV8 z^a$wR1}?7Knz9F6?f^qihHT2N6r?E>3c&jreNzq?xCMIGyxv;-IDG&z)K%&RI5-5x zihA}?-*UzHU{uin000SaNLh0L04^f{04^f|c%?sf00007bV*G` z2j~F-0R|14Hq4d)000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0000y zNkljR-vRh f^fNgHmQ!E{xK0@V>DVC100000NkvXXu0mjf04eij literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tone_gen/images/play_button/frame_03.png b/non_catalog_apps/tone_gen/images/play_button/frame_03.png new file mode 100644 index 0000000000000000000000000000000000000000..d164df50b4780f409e32b0069d50b86a46d1af5f GIT binary patch literal 592 zcmV-W0EX>4Tx04R}tkv&MmKpe$iQ>7vm2aAXZW~fefQ4z;lg(6f4wL+^7CYOFelZGV4 z#ZhoAIQX$xb#QUk)xlK|1V2DrU7QqMq{ROvg%&X$9QWhhy~o`x##3oQp0CJTqcu((}X-VzJo4N(Zx&sS!^TM^#Oyd?D+x z%6W^kR;jVpJ^2g6d3|M>>oiA@#3Gg;L4<-D%Ba9bj8>f#3u)R<`1prizeFyDTxBqF zET9Svvg-%`gWug+g{es|DVzYhUmWLS3<&K4&AQ`!A3IL-1PDF@S9;rDZ2+^Mq}SV8 z^a$wR1}?7Knz9F6?f^qihHT2N6r?E>3c&jreNzq?xCMIGyxv;-IDG&z)K%&RI5-5x zihA}?-*UzHU{uin000SaNLh0L04^f{04^f|c%?sf00007bV*G` z2j~F-0R_CX>@2HM@dakSAh-}0000x zNklEX>4Tx04R}tkv&MmKpe$iQ>7vm2aAXZW~fefQ4z;lg(6f4wL+^7CYOFelZGV4 z#ZhoAIQX$xb#QUk)xlK|1V2DrU7QqMq{ROvg%&X$9QWhhy~o`x##3oQp0CJTqcu((}X-VzJo4N(Zx&sS!^TM^#Oyd?D+x z%6W^kR;jVpJ^2g6d3|M>>oiA@#3Gg;L4<-D%Ba9bj8>f#3u)R<`1prizeFyDTxBqF zET9Svvg-%`gWug+g{es|DVzYhUmWLS3<&K4&AQ`!A3IL-1PDF@S9;rDZ2+^Mq}SV8 z^a$wR1}?7Knz9F6?f^qihHT2N6r?E>3c&jreNzq?xCMIGyxv;-IDG&z)K%&RI5-5x zihA}?-*UzHU{uin000SaNLh0L04^f{04^f|c%?sf00007bV*G` z2j~F-0R_CX>@2HM@dakSAh-}0000m zNkly1g~8U!xOJgHX(Awnj9d&%$O?sf Z`Z*??e%RMtWLNt7N}JQ{7Dq+~YXGojE)M_z literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tone_gen/images/settings_button/frame_01.png b/non_catalog_apps/tone_gen/images/settings_button/frame_01.png new file mode 100644 index 0000000000000000000000000000000000000000..8ef0cb9493272177a933e387369f8fa3a30e17b7 GIT binary patch literal 604 zcmV-i0;BzjP)EX>4Tx04R}tkv&MmKpe$iQ>7vm2aAXZW~fefQ4z;lg(6f4wL+^7CYOFelZGV4 z#ZhoAIQX$xb#QUk)xlK|1V2DrU7QqMq{ROvg%&X$9QWhhy~o`x##3oQp0CJTqcu((}X-VzJo4N(Zx&sS!^TM^#Oyd?D+x z%6W^kR;jVpJ^2g6d3|M>>oiA@#3Gg;L4<-D%Ba9bj8>f#3u)R<`1prizeFyDTxBqF zET9Svvg-%`gWug+g{es|DVzYhUmWLS3<&K4&AQ`!A3IL-1PDF@S9;rDZ2+^Mq}SV8 z^a$wR1}?7Knz9F6?f^qihHT2N6r?E>3c&jreNzq?xCMIGyxv;-IDG&z)K%&RI5-5x zihA}?-*UzHU{uin000SaNLh0L04^f{04^f|c%?sf00007bV*G` z2j~F-0Ua)pXLf!7000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0000- zNklh2m*(V|Nk;QZ9;5q%27cw%C-qf0-%klT%H1d=;KkF(e_pgAi!yw q>ffvLN?zzNb)&t)OsWnsJ$wPL8z2$jFAp{V0000EX>4Tx04R}tkv&MmKpe$iQ>7vm2aAXZW~fefQ4z;lg(6f4wL+^7CYOFelZGV4 z#ZhoAIQX$xb#QUk)xlK|1V2DrU7QqMq{ROvg%&X$9QWhhy~o`x##3oQp0CJTqcu((}X-VzJo4N(Zx&sS!^TM^#Oyd?D+x z%6W^kR;jVpJ^2g6d3|M>>oiA@#3Gg;L4<-D%Ba9bj8>f#3u)R<`1prizeFyDTxBqF zET9Svvg-%`gWug+g{es|DVzYhUmWLS3<&K4&AQ`!A3IL-1PDF@S9;rDZ2+^Mq}SV8 z^a$wR1}?7Knz9F6?f^qihHT2N6r?E>3c&jreNzq?xCMIGyxv;-IDG&z)K%&RI5-5x zihA}?-*UzHU{uin000SaNLh0L04^f{04^f|c%?sf00007bV*G` z2j~F-0Uk20OL_7D000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0000) zNkllCCxlKNq3h{`nEI&1fB noJg;J4fyJ~(wS>7VHy$}1sWX`EBSRE00000NkvXXu0mjfBK`8N literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tone_gen/images/settings_button/frame_rate b/non_catalog_apps/tone_gen/images/settings_button/frame_rate new file mode 100644 index 00000000000..d8263ee9860 --- /dev/null +++ b/non_catalog_apps/tone_gen/images/settings_button/frame_rate @@ -0,0 +1 @@ +2 \ No newline at end of file diff --git a/non_catalog_apps/tone_gen/screenshots/menu.png b/non_catalog_apps/tone_gen/screenshots/menu.png new file mode 100644 index 0000000000000000000000000000000000000000..8d8250e03724ae33d948edb4ed6b705796af5067 GIT binary patch literal 1748 zcmaKte@s(X6vxk_x+gj*8_sP^tYj{@AjYkcSnyFa5P?K&gsBC8PA9YefR$096?tRx z7ZHC%faafUIDVbz(Qm8+$WrU*HR*^nwowPn|eRMTz)~j**Xb=j$whT3gKbvxtll$-c~%0RS2h$*+rpU@T1SR^*709L0$CT(pwJEs6r9tU z+ghKi!+L(o5sz{?^^ImzEah3>_yrSlEVsyh-MIhEZ-Goz)_jOkc=WXrKIK~OG}&b` zc0-S?#F;>MwN#(okAxS`yqSAs9lN8&B63H?{UtjX{xXR?$&EHAYvQQ!U^Rl`MS$&# z?o^IB`7ZZ)dP~-j$L8TGC*J@0B=T)({d)Va+Gm}IDreUq%VIuRuJW)PTk!x-C&bp; z*;i5T*HeF`2>&s?FcdaU(MrcU9Ll#@_=5=1cL*}aQnI={m~7j|G+kx|Zii-=)5l;> z*Hqt;PK4xES${svx~$M+q|wt3nci?o*%_}~rX5WCE*6qC4^Nnx0Za7Jz1Y?5(= z>_>)IOd9Gg8$#zAW;vfOl=54L%)*Pa`^%9^xYx4pSHz9jc64UjdLLce)Ag}PpIxRe zp~|5DfL}K;4otp^(g<}EC%AhH^>@6)$@;kHu?Gdv9PAgwX%kEE0i&+uioT~RJkcZ% zV5%RO*22K;Bl3)mGQ(jSvyX08Z}9G>zIp2bz`QB{NUo21h8Gw-D&e(asdr;F3(n5* z%k=>)_`%LzQiUu@;oVgft}tLA2=%Ly0J8gK6F9}iA#tf+svD9CmH6lq@K6Mf0@7W` zNqUIGPEDOXHw4I1|9L-?0SxvaAlo?5X+;D2I#$giq@(a&NuYZeMD)zq5_l|>1UiRE zg$o)S#@dyzuy+=~WIsFc%+OA&h{;4$r@e{`8i^Q1B;4mCoHA))VvN=ku_3?9=IXP3 zr8`!1{)Fp@Qzj{NF4L7Y=7+f#ij}vA$!rvlg&=G9Wwv#+({XgAvY_?^ zb+2Jjdn$L5R@>v=w`Pa1r2CI-Mf{We&A1(*SZT!Mg?4Y*0HZc@Ze_PSMhSIngZGwa zFwD5SG|IZl2vo}G09pT_>gU45M zckxzwGc+Yq{yD2o)4?AbQASpw?xzNgz?Qz?f<2Gm?((n0w`t?>7ah$>~W=%Qlt%4b)e51poj5 literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tone_gen/screenshots/playback.png b/non_catalog_apps/tone_gen/screenshots/playback.png new file mode 100644 index 0000000000000000000000000000000000000000..36ccb6a91f9370cef0a1916dde5e42d006a25154 GIT binary patch literal 1487 zcmeAS@N?(olHy`uVBq!ia0y~yU;;8388|?c*QZDWAjMhW5n0T@z%2~Ij105pNH8$4 zHhQ`^hE&XXd)vF{wuOkp#j;bUPyVVBjEuiF`BkI(o1n|O(Gxfx%ricnt`O*Qw~FEC zx98W-?`L@Nv+yfB!viTM1_4zDhQPr~<){Du0CaJ9UEj(-KYo9&|5y8SmdsAO?dR5= zocOwUb&YS|x?Of^3=JBL3>`uY4J*Dsmb+~Gd&X|7y6>B7w^#o=zwX?=>Ywv0AOEV^ zu*}Z<@GK)n1{Y2ShbasUE_>zw7i{AXy*>MJ-P7u4^WI1Av#U9;{a#WSA`Mh^<@f*p z(`#!>>(_3ZAN`}RC)Kw$Z`=C}Ca_%~E4}738iXabk4lJ%X|=Fxjdbr^>0kx z&$aW9&q^{wxKQIgW6k8hF%sF=O-(yi&z*Gynxic8nz9O>h#W>ne|8u#RD!kv)eX?#RMY> zrZY5GE|WgCY1zEvEbuh7^{r&XUMGpuvu^csLW~5OoORon;n|a!c@nQDnx-P0QT2l7 zK%JiT%!hK@mQ|=CygB7NgVP($!x5|3Bl&%bafA9NA9G-Q^dcE?>lM#|c?v+mw`Y;u za8;5a`y){8*Q?0Z6|p(Y+RT0mDZ&n)W3ahwtG@r}t~Dzy-+qanfe45_>>rfA6({Os zzbZs{dBxN73~&A(jJOukj^w$Y#th#cfIK%3&9**cwjW5LUUf>cA$`~Sr?cK4pSA1S zy6blkE`Dm;z&7)J-ybP0l+XkKOIzXb literal 0 HcmV?d00001 diff --git a/non_catalog_apps/tone_gen/screenshots/settings.png b/non_catalog_apps/tone_gen/screenshots/settings.png new file mode 100644 index 0000000000000000000000000000000000000000..afeaba14b44eccf460f0c42c9ce31580c827377c GIT binary patch literal 1785 zcmb_dYfMvT7=8~ZH!qM)jYUT_#*D2Bb`0W_3Ze*VR2(2sZW4zb?HCB5P)aFblFe8o zW?ZBLs$)XASp*vete~h&HmQ+P6y;(XM2k=nOR-S8uc3y|Y}udf$H{lT@4V+Z@B2K@ z`<_z)2mO}WIobihvc3MhzXq^Cw*=UjmVIx+wxGo}(LXF1V9Cd(ivVHCY5=R6y}Ne? zrIn2J?>zJL^A(F91S$Twr*HVF)^+sM+|VIA-*InCk3@N~Z&H(UNRuRO`fRT#+Uo|9 zSg7&h8)wd~xl6QVF9L680vyyT1KHhu1C+Tl$COK9T|R)#MgSjKnG-;Cs?_PcJ!I{- zSa@IySpomN)lO)3sjqANPDriqh>x**n~QXvz04fymP7XwQicaV6}ef?W1Aq_l`t(7 z_Pq$+92{9dqO)|FB2hSJ^KC4J_$I3d`tRNdoN{V(&D~pjHHYbSNeui8{Rw`sLP<;$1v*M zvxJ6S^t?FUnD}yTdVDU4TlZFwtYDNFcvN{Qmyim1US0KlX#>Rsocsvj0%Bg=+if|- zp?Fnh#CA~Im(p14kIz3aNzxhRy(zwkA&c?D4%NdPW|mCQSAGv;XeAG(qO5<9u>uEE zu4Zr(#{aR6;%6FGC;f^%!+$3&zY7X(D}y_JQ#q-at-H2OE~ZX;xh8Dco+kcj&Gs9Eg-?&(-MEq>+L$omRkZtyIs2 zv_9J|4@{mbQ*p;jg_Bp9h8Al3uzOSdBG}|>F0!JQ5L5@|rAJ+>V1HHpedw_u8gFVO zxP#2fX*LFq#Lv6+!=OxN>|wJoG0YZ{x4o)iV2b>?N5{gc?z zs!GPUiW#*f3{lPAmOhR0rm<_IB_7XLsvB*OORNRz3&odHjdm%EXctjmWSg5M zzSSzAk?((i*T|5(CP_*UQ!>=_iKdg%!oxGOf~1kvN2W8i1Ozy|SKm%sRZ#bOsm3LO z68iHF0K4~J<&i0y z(xbMkJmXx9=dhVr|uGby3D7(vnqa+_GD4VS;mCy9z= zujUL>vqq9zSNk9iQnbyn?J;)X%tHF%^CO8%5L*f{-2X~^{thGn*7ZoJwr6+-NJKmX zQ+zwlI-O8&u%OvIg UwiwAL=wAkVeGl%w +#include +#include +#include + +#include "tone_gen.h" +#include "app_context.h" + +/** custom event handler - passes the event to the scene manager */ +bool viewDispatcherCustomCallback(void* context, uint32_t custom_event) { + furi_assert(context); + struct AppContext_t* appContext = context; + return scene_manager_handle_custom_event(appContext->scene_manager, custom_event); +} + +/** navigation event handler - passes the event to the scene manager */ +bool viewDispatcherNavigationCallback(void* context) { + furi_assert(context); + struct AppContext_t* appContext = context; + return scene_manager_handle_back_event(appContext->scene_manager); +} + +AppContextStatus initializeAppContext( + struct AppContext_t** context, + int viewsCount, + const SceneManagerHandlers* sceneManagerHandlers) { + FURI_LOG_I(TAG, "Allocating memory for app context"); + + *context = malloc(sizeof(struct AppContext_t)); + if(*context == NULL) { + FURI_LOG_E(TAG, "Failed to allocate memory for app context"); + return APP_CONTEXT_CANT_ALLOCATE; + } + + // Allocate our scene manager with the handlers provided + FURI_LOG_I(TAG, "Setting up the scene manager"); + (*context)->scene_manager = scene_manager_alloc(sceneManagerHandlers, *context); + + // Now setup our view dispatchers + FURI_LOG_I(TAG, "Setting up the view dispatcher"); + (*context)->view_dispatcher = view_dispatcher_alloc(); + view_dispatcher_enable_queue((*context)->view_dispatcher); + + FURI_LOG_I(TAG, "Setting view dispatcher callbacks"); + view_dispatcher_set_event_callback_context((*context)->view_dispatcher, (*context)); + FURI_LOG_I(TAG, "Setting view dispatcher custom event callbacks"); + view_dispatcher_set_custom_event_callback( + (*context)->view_dispatcher, viewDispatcherCustomCallback); + FURI_LOG_I(TAG, "Setting view dispatcher navigation event callbacks"); + view_dispatcher_set_navigation_event_callback( + (*context)->view_dispatcher, viewDispatcherNavigationCallback); + FURI_LOG_I(TAG, "Setting view dispatcher callbacks done"); + + (*context)->activeViews = malloc(sizeof(struct View_t) * viewsCount); + if((*context)->activeViews == NULL) { + return APP_CONTEXT_CANT_ALLOCATE; + } + (*context)->activeViewsCount = viewsCount; + + return APP_CONTEXT_OK; +} + +AppContextStatus addViewToAppContext(struct AppContext_t** context, struct View_t* view) { + if(view->viewId > (*context)->activeViewsCount || view->viewId < 0) { + FURI_LOG_I(TAG, "Not enough views!"); + return APP_CONTEXT_NOT_ENOUGH_VIEWS; + } + (*context)->activeViews[view->viewId] = view; + switch(view->type) { + case MENU: + view_dispatcher_add_view( + (*context)->view_dispatcher, view->viewId, menu_get_view(view->viewData)); + break; + case SUBMENU: + view_dispatcher_add_view( + (*context)->view_dispatcher, view->viewId, submenu_get_view(view->viewData)); + break; + case VIEW: + view_dispatcher_add_view((*context)->view_dispatcher, view->viewId, view->viewData); + break; + case VARIABLE_ITEM_LIST: + view_dispatcher_add_view( + (*context)->view_dispatcher, + view->viewId, + variable_item_list_get_view(view->viewData)); + break; + case POPUP: + view_dispatcher_add_view( + (*context)->view_dispatcher, view->viewId, popup_get_view(view->viewData)); + break; + } + return APP_CONTEXT_OK; +} + +AppContextStatus freeAppContextViews(struct AppContext_t** context) { + FURI_LOG_I(TAG, "Freeing views"); + for(int i = 0; i < (*context)->activeViewsCount; i++) { + struct View_t* view = (*context)->activeViews[i]; + if(view != NULL) { + view_dispatcher_remove_view((*context)->view_dispatcher, view->viewId); + + switch(view->type) { + case MENU: + menu_free(view->viewData); + break; + case SUBMENU: + submenu_free(view->viewData); + break; + case VIEW: + view_free(view->viewData); + break; + case VARIABLE_ITEM_LIST: + variable_item_list_free(view->viewData); + break; + case POPUP: + popup_free(view->viewData); + break; + } + free(view); + } + } + FURI_LOG_I(TAG, "Removing all views from list"); + free((*context)->activeViews); + (*context)->activeViewsCount = 0; + return APP_CONTEXT_OK; +} + +AppContextStatus freeAppContext(struct AppContext_t** context) { + FURI_LOG_I(TAG, "Ensuring views are free'd"); + AppContextStatus result = freeAppContextViews(context); + if(result != APP_CONTEXT_OK) { + return APP_CONTEXT_CANT_FREE_VIEWS; + } + FURI_LOG_I(TAG, "Freeing the scene"); + scene_manager_free((*context)->scene_manager); + FURI_LOG_I(TAG, "Freeing the view dispatcher"); + view_dispatcher_free((*context)->view_dispatcher); + FURI_LOG_I(TAG, "Freeing the app context"); + free((*context)); + return APP_CONTEXT_OK; +} diff --git a/non_catalog_apps/tone_gen/src/app_context.h b/non_catalog_apps/tone_gen/src/app_context.h new file mode 100644 index 00000000000..0aa8b6eaabe --- /dev/null +++ b/non_catalog_apps/tone_gen/src/app_context.h @@ -0,0 +1,62 @@ +#ifndef _APP_CONTEXT_H_ + +#define _APP_CONTEXT_H_ + +#include +#include + +#include "utils/linked_list.h" + +typedef enum { + MENU, + SUBMENU, + VIEW, + VARIABLE_ITEM_LIST, + POPUP, +} ViewType; + +struct View_t { + ViewType type; + int viewId; + void* viewData; +}; + +typedef enum { + APP_CONTEXT_OK = 0, + APP_CONTEXT_CANT_ALLOCATE = -1, + APP_CONTEXT_CANT_FREE_VIEWS = -2, + APP_CONTEXT_NOT_ENOUGH_VIEWS = -3, + APP_CONTEXT_UNKNOWN_ERROR = -4, +} AppContextStatus; + +struct AppContext_t { + SceneManager* scene_manager; + ViewDispatcher* view_dispatcher; + struct View_t** activeViews; + int activeViewsCount; + void* additionalData; +}; + +/// @brief Creates an app context with the desired scene handlers. +/// @param context The app context to populate. Will be passed through to the supplied scene handlers. +/// @param viewsCount The number of views that to be added to this scene. +/// @param sceneManagerHandlers The scene handlers to use for each scene in your app. +/// @return Returns APP_CONTEXT_OK on success, APP_CONTEXT_CANT_ALLOCATE if there is an error. +AppContextStatus initializeAppContext( + struct AppContext_t** context, + int viewsCount, + const SceneManagerHandlers* sceneManagerHandlers); + +/// @brief Adds a view to the given app context. +/// @param context The app context to add the view to. +/// @param view The view to add to the app context. +/// @return Returns APP_CONTEXT_OK on success, APP_CONTEXT_NOT_ENOUGH_VIEWS if the ID of +// the view exceeds the number of available views in the app context. +AppContextStatus addViewToAppContext(struct AppContext_t** context, struct View_t* view); + +/// @brief Frees the app context entirely, cleaning it up from usage. +/// @param context The app context to clean up. +/// @return Returns APP_CONTEXT_OK on success. Should not error. +AppContextStatus freeAppContext(struct AppContext_t** context); + +#endif diff --git a/non_catalog_apps/tone_gen/src/scenes/playback_scene.c b/non_catalog_apps/tone_gen/src/scenes/playback_scene.c new file mode 100644 index 00000000000..d78abaceafb --- /dev/null +++ b/non_catalog_apps/tone_gen/src/scenes/playback_scene.c @@ -0,0 +1,88 @@ +#include + +#include "playback_scene.h" +#include "../app_context.h" +#include "../tone_gen.h" +#include "../system/audio_helper.h" + +#define SINE_WAVE(x, toneModelData) \ + (sin((x + toneDataModel->animationOffset) * 50) * 20 + (64 / 2)) + +#define SQUARE_WAVE(x, toneModelData) \ + ((sin((x + toneDataModel->animationOffset) * 50) > 0 ? 1 : -1) * 20 + (64 / 2)) + +// Renders the waveform +static void playback_view_draw_callback(Canvas* canvas, void* model) { + UNUSED(model); + + struct ToneData_t* toneDataModel = (struct ToneData_t*)model; + for(int x = 1; x < 128; x++) { + int x1 = x - 1; + int x2 = x; + int y1 = 0; + int y2 = 0; + switch(toneDataModel->waveType) { + case SINE: + y1 = SINE_WAVE(x1, toneDataModel); + y2 = SINE_WAVE(x2, toneDataModel); + break; + case SQUARE: + y1 = SQUARE_WAVE(x1, toneDataModel); + y2 = SQUARE_WAVE(x2, toneDataModel); + break; + default: + y1 = 64 / 2; + y2 = 64 / 2; + break; + } + // Draw lines to connect the pieces of the wave. + canvas_draw_line(canvas, x1, y1, x2, y2); + } + if(toneDataModel->animationOffset < 128) { + toneDataModel->animationOffset += 2; + } else { + toneDataModel->animationOffset = 0; + } +} + +// Sets up the waveform to be displayed +void scene_on_enter_playback_scene(void* context) { + FURI_LOG_I(TAG, "scene_on_enter_playback_scene"); + struct AppContext_t* app = (struct AppContext_t*)context; + struct View_t* playbackView = app->activeViews[ToneGenAppView_PlaybackView]; + + // Configure the custom view + view_set_draw_callback(playbackView->viewData, playback_view_draw_callback); + view_set_context(playbackView->viewData, context); + + FURI_LOG_I(TAG, "setting view model"); + struct ToneData_t* toneDataModel = (struct ToneData_t*)view_get_model(playbackView->viewData); + toneDataModel->waveType = ((struct ToneData_t*)app->additionalData)->waveType; + toneDataModel->frequency = ((struct ToneData_t*)app->additionalData)->frequency; + toneDataModel->volume = ((struct ToneData_t*)app->additionalData)->volume; + + // Set the currently active view + FURI_LOG_I(TAG, "setting active view"); + view_dispatcher_switch_to_view(app->view_dispatcher, ToneGenAppView_PlaybackView); + + if(initializeSpeaker()) { + FURI_LOG_I(TAG, "Starting sound"); + startSound(toneDataModel); + } +} + +// Not actively used in this instance. +bool scene_on_event_playback_scene(void* context, SceneManagerEvent event) { + FURI_LOG_I(TAG, "scene_on_event_playback_scene"); + UNUSED(context); + UNUSED(event); + return false; +} + +// Not actively used in this instance. +void scene_on_exit_playback_scene(void* context) { + FURI_LOG_I(TAG, "scene_on_exit_playback_scene"); + UNUSED(context); + stopSound(); + deinitializeSpeaker(); +} diff --git a/non_catalog_apps/tone_gen/src/scenes/playback_scene.h b/non_catalog_apps/tone_gen/src/scenes/playback_scene.h new file mode 100644 index 00000000000..d397481c89f --- /dev/null +++ b/non_catalog_apps/tone_gen/src/scenes/playback_scene.h @@ -0,0 +1,11 @@ +#ifndef _PLAYBACK_SCENE_H_ + +#define _PLAYBACK_SCENE_H_ + +#include + +void scene_on_enter_playback_scene(void* context); +bool scene_on_event_playback_scene(void* context, SceneManagerEvent event); +void scene_on_exit_playback_scene(void* context); + +#endif diff --git a/non_catalog_apps/tone_gen/src/scenes/settings_scene.c b/non_catalog_apps/tone_gen/src/scenes/settings_scene.c new file mode 100644 index 00000000000..d90c5b565ca --- /dev/null +++ b/non_catalog_apps/tone_gen/src/scenes/settings_scene.c @@ -0,0 +1,119 @@ +#include + +#include "settings_scene.h" +#include "../app_context.h" +#include "../tone_gen.h" +#include "../utils/linked_list.h" + +// Not actively used in this instance. +void menu_callback_settings_scene(void* context, uint32_t index) { + UNUSED(context); + UNUSED(index); +} + +static uint8_t wave_option_values[] = {SINE, SQUARE}; +static char* wave_option_names[] = {"Sine", "Square"}; +static void wave_type_option_change(VariableItem* item) { + struct AppContext_t* app = variable_item_get_context(item); + uint8_t index = variable_item_get_current_value_index(item); + variable_item_set_current_value_text(item, wave_option_names[index]); + ((struct ToneData_t*)app->additionalData)->waveType = index; +} + +// Since the max number of options for variable item lists is +// the size of an 8-bit integer, we need to limit the max +// number of steps. In this case, we limit it to 241 total +// steps available, incrementing in steps of 10. +#define MIN_FREQ 100 +#define MAX_FREQ 2500 +#define FREQ_STEPS 10 +#define INDEX_TO_FREQ(index) (uint16_t)((index * FREQ_STEPS) + MIN_FREQ) +#define FREQ_TO_INDEX(freq) (uint8_t)((freq - MIN_FREQ) / FREQ_STEPS) +char* frequencyStr; +static void frequency_option_change(VariableItem* item) { + struct AppContext_t* app = variable_item_get_context(item); + uint8_t index = variable_item_get_current_value_index(item); + ((struct ToneData_t*)app->additionalData)->frequency = INDEX_TO_FREQ(index); + snprintf(frequencyStr, 8, "%dhz", ((struct ToneData_t*)app->additionalData)->frequency); + variable_item_set_current_value_text(item, frequencyStr); +} + +char* volumeStr; +static void volume_option_change(VariableItem* item) { + struct AppContext_t* app = variable_item_get_context(item); + uint8_t index = variable_item_get_current_value_index(item); + ((struct ToneData_t*)app->additionalData)->volume = ((float)(index)) / 10.0f; + snprintf(volumeStr, 5, "%d", (index * 10)); + variable_item_set_current_value_text(item, volumeStr); +} + +/** resets the menu, gives it content, callbacks and selection enums */ +void scene_on_enter_settings_scene(void* context) { + FURI_LOG_I(TAG, "scene_on_enter_settings_scene"); + struct AppContext_t* app = (struct AppContext_t*)context; + + // Setup our menu + FURI_LOG_D(TAG, "Adding view menu"); + struct View_t* variableItemListView = app->activeViews[ToneGenAppView_VariableItemList]; + + // Set the currently active view + variable_item_list_reset(variableItemListView->viewData); + + FURI_LOG_D(TAG, "Adding options for settings"); + // Wave type setting + VariableItem* item = variable_item_list_add( + variableItemListView->viewData, + "Wave Display", + COUNT_OF(wave_option_values), + wave_type_option_change, + app); + variable_item_set_current_value_index( + item, ((struct ToneData_t*)app->additionalData)->waveType); + variable_item_set_current_value_text( + item, wave_option_names[((struct ToneData_t*)app->additionalData)->waveType]); + + // Frequency setting + item = variable_item_list_add( + variableItemListView->viewData, + "Frequency", + FREQ_TO_INDEX(MAX_FREQ) + 1, + frequency_option_change, + app); + variable_item_set_current_value_index( + item, FREQ_TO_INDEX(((struct ToneData_t*)app->additionalData)->frequency)); + + frequencyStr = calloc(8, sizeof(char)); + snprintf(frequencyStr, 8, "%dhz", ((struct ToneData_t*)app->additionalData)->frequency); + variable_item_set_current_value_text(item, frequencyStr); + + // Volume setting + item = variable_item_list_add( + variableItemListView->viewData, "Volume", 11, volume_option_change, app); + variable_item_set_current_value_index( + item, (uint8_t)(((struct ToneData_t*)app->additionalData)->volume * 10.0f)); + + volumeStr = calloc(5, sizeof(char)); + snprintf( + volumeStr, + 5, + "%d", + ((uint8_t)(((struct ToneData_t*)app->additionalData)->volume * 100.0f))); + variable_item_set_current_value_text(item, volumeStr); + + view_dispatcher_switch_to_view(app->view_dispatcher, ToneGenAppView_VariableItemList); +} + +// Not actively used in this instance. +bool scene_on_event_settings_scene(void* context, SceneManagerEvent event) { + FURI_LOG_I(TAG, "scene_on_event_settings_scene"); + UNUSED(context); + UNUSED(event); + return false; +} + +void scene_on_exit_settings_scene(void* context) { + FURI_LOG_I(TAG, "scene_on_exit_settings_scene"); + UNUSED(context); + free(frequencyStr); + free(volumeStr); +} diff --git a/non_catalog_apps/tone_gen/src/scenes/settings_scene.h b/non_catalog_apps/tone_gen/src/scenes/settings_scene.h new file mode 100644 index 00000000000..b4e9fc11c27 --- /dev/null +++ b/non_catalog_apps/tone_gen/src/scenes/settings_scene.h @@ -0,0 +1,11 @@ +#ifndef _SETTINGS_SCENE_H_ + +#define _SETTINGS_SCENE_H_ + +#include + +void scene_on_enter_settings_scene(void* context); +bool scene_on_event_settings_scene(void* context, SceneManagerEvent event); +void scene_on_exit_settings_scene(void* context); + +#endif diff --git a/non_catalog_apps/tone_gen/src/scenes/starting_scene.c b/non_catalog_apps/tone_gen/src/scenes/starting_scene.c new file mode 100644 index 00000000000..10ad5389640 --- /dev/null +++ b/non_catalog_apps/tone_gen/src/scenes/starting_scene.c @@ -0,0 +1,92 @@ +#include +#include + +#include "starting_scene.h" +#include "../app_context.h" +#include "../tone_gen.h" +#include "../utils/linked_list.h" + +// Icons to include +#include "tone_gen_icons.h" + +/** indices for menu items */ +typedef enum { + ToneGenAppMenuSelection_Play, + ToneGenAppMenuSelection_Adjust +} ToneGenAppMenuSelection; + +/** main menu callback - sends a custom event to the scene manager based on the menu selection */ +void menu_callback_starting_scene(void* context, uint32_t index) { + FURI_LOG_I(TAG, "menu_callback_starting_scene"); + UNUSED(context); + struct AppContext_t* app = context; + switch(index) { + case ToneGenAppMenuSelection_Play: + scene_manager_handle_custom_event(app->scene_manager, ToneGenAppMenuSelection_Play); + break; + case ToneGenAppMenuSelection_Adjust: + scene_manager_handle_custom_event(app->scene_manager, ToneGenAppMenuSelection_Adjust); + break; + } +} + +/** resets the menu, gives it content, callbacks and selection enums */ +void scene_on_enter_starting_scene(void* context) { + FURI_LOG_I(TAG, "scene_on_enter_starting_scene"); + struct AppContext_t* app = (struct AppContext_t*)context; + struct View_t* menuView = app->activeViews[ToneGenAppView_SharedMenu]; + + // Set the currently active view + menu_reset(menuView->viewData); + + // NB. icons are specified as NULL below, because: + // * icons are _always_ animated by the menu + // * the icons provided (&I_one, &I_two) are generated by the build process + // * these icons do not have a framerate (resulting in a division by zero) + menu_add_item( + menuView->viewData, + "Play Tone", + &A_play_button, + ToneGenAppMenuSelection_Play, + menu_callback_starting_scene, + app); + menu_add_item( + menuView->viewData, + "Adjust Tone", + &A_settings_button, + ToneGenAppMenuSelection_Adjust, + menu_callback_starting_scene, + app); + view_dispatcher_switch_to_view(app->view_dispatcher, ToneGenAppView_SharedMenu); +} + +/** main menu event handler - switches scene based on the event */ +bool scene_on_event_starting_scene(void* context, SceneManagerEvent event) { + FURI_LOG_I(TAG, "scene_on_event_starting_scene"); + UNUSED(context); + struct AppContext_t* app = context; + bool consumed = false; + switch(event.type) { + case SceneManagerEventTypeCustom: + switch(event.event) { + case ToneGenAppMenuSelection_Play: + scene_manager_next_scene(app->scene_manager, ToneGenAppScene_Playback); + consumed = true; + break; + case ToneGenAppMenuSelection_Adjust: + scene_manager_next_scene(app->scene_manager, ToneGenAppScene_Settings); + consumed = true; + break; + } + break; + default: // eg. SceneManagerEventTypeBack, SceneManagerEventTypeTick + consumed = false; + break; + } + return consumed; +} + +void scene_on_exit_starting_scene(void* context) { + FURI_LOG_I(TAG, "scene_on_exit_starting_scene"); + UNUSED(context); +} diff --git a/non_catalog_apps/tone_gen/src/scenes/starting_scene.h b/non_catalog_apps/tone_gen/src/scenes/starting_scene.h new file mode 100644 index 00000000000..50ec1bc3cea --- /dev/null +++ b/non_catalog_apps/tone_gen/src/scenes/starting_scene.h @@ -0,0 +1,11 @@ +#ifndef _STARTING_SCENE_H_ + +#define _STARTING_SCENE_H_ + +#include + +void scene_on_enter_starting_scene(void* context); +bool scene_on_event_starting_scene(void* context, SceneManagerEvent event); +void scene_on_exit_starting_scene(void* context); + +#endif diff --git a/non_catalog_apps/tone_gen/src/system/audio_helper.c b/non_catalog_apps/tone_gen/src/system/audio_helper.c new file mode 100644 index 00000000000..c9fe2a68833 --- /dev/null +++ b/non_catalog_apps/tone_gen/src/system/audio_helper.c @@ -0,0 +1,28 @@ +#include "audio_helper.h" + +bool initializeSpeaker() { + return furi_hal_speaker_acquire(SPEAKER_TIMEOUT); +} + +bool startSound(struct ToneData_t* toneData) { + bool hasSpeaker = furi_hal_speaker_is_mine(); + if(!hasSpeaker) { + hasSpeaker = furi_hal_speaker_acquire(SPEAKER_TIMEOUT); + } + + if(hasSpeaker) { + FURI_LOG_I(TAG, "Sound is beginning to play"); + furi_hal_speaker_start(toneData->frequency, toneData->volume); + } else { + FURI_LOG_E(TAG, "Error acquiring speaker!"); + } + return hasSpeaker; +} + +void stopSound() { + furi_hal_speaker_stop(); +} + +void deinitializeSpeaker() { + furi_hal_speaker_release(); +} diff --git a/non_catalog_apps/tone_gen/src/system/audio_helper.h b/non_catalog_apps/tone_gen/src/system/audio_helper.h new file mode 100644 index 00000000000..186f95c0349 --- /dev/null +++ b/non_catalog_apps/tone_gen/src/system/audio_helper.h @@ -0,0 +1,16 @@ +#ifndef _AUDIO_HELPER_H_ + +#define _AUDIO_HELPER_H_ + +#include + +#include "../tone_gen.h" + +#define SPEAKER_TIMEOUT 10 + +bool initializeSpeaker(); +bool startSound(struct ToneData_t* toneData); +void stopSound(); +void deinitializeSpeaker(); + +#endif diff --git a/non_catalog_apps/tone_gen/src/tone_gen.c b/non_catalog_apps/tone_gen/src/tone_gen.c new file mode 100644 index 00000000000..bc8f7d931dc --- /dev/null +++ b/non_catalog_apps/tone_gen/src/tone_gen.c @@ -0,0 +1,140 @@ +#include +#include +#include +#include + +/* generated by fbt from .png files in images folder */ +#include + +#include "app_context.h" +#include "tone_gen.h" + +#include "scenes/starting_scene.h" +#include "scenes/playback_scene.h" +#include "scenes/settings_scene.h" + +/** collection of all scene on_enter handlers - in the same order as their enum */ +void (*const scene_on_enter_handlers[])(void*) = { + scene_on_enter_starting_scene, + scene_on_enter_playback_scene, + scene_on_enter_settings_scene, +}; + +/** collection of all scene on event handlers - in the same order as their enum */ +bool (*const scene_on_event_handlers[])(void*, SceneManagerEvent) = { + scene_on_event_starting_scene, + scene_on_event_playback_scene, + scene_on_event_settings_scene, +}; + +/** collection of all scene on exit handlers - in the same order as their enum */ +void (*const scene_on_exit_handlers[])(void*) = { + scene_on_exit_starting_scene, + scene_on_exit_playback_scene, + scene_on_exit_settings_scene, +}; + +const SceneManagerHandlers scene_event_handlers = { + .on_enter_handlers = scene_on_enter_handlers, + .on_event_handlers = scene_on_event_handlers, + .on_exit_handlers = scene_on_exit_handlers, + .scene_num = ToneGenAppScene_count}; + +int setupViews(struct AppContext_t** appContext) { + // Create views + FURI_LOG_I(TAG, "Creating views"); + struct View_t* sharedMenuView = malloc(sizeof(struct View_t)); + sharedMenuView->viewData = menu_alloc(); + sharedMenuView->viewId = ToneGenAppView_SharedMenu; + sharedMenuView->type = MENU; + + struct View_t* submenuView = malloc(sizeof(struct View_t)); + submenuView->viewData = submenu_alloc(); + submenuView->viewId = ToneGenAppView_Submenu; + submenuView->type = SUBMENU; + + struct View_t* playbackView = malloc(sizeof(struct View_t)); + playbackView->viewData = view_alloc(); + playbackView->viewId = ToneGenAppView_PlaybackView; + playbackView->type = VIEW; + + FURI_LOG_I(TAG, "creating var-item-list view"); + struct View_t* variableItemListView = malloc(sizeof(struct View_t)); + FURI_LOG_I(TAG, "allocating view data"); + variableItemListView->viewData = variable_item_list_alloc(); + FURI_LOG_I(TAG, "setting view id"); + variableItemListView->viewId = ToneGenAppView_VariableItemList; + FURI_LOG_I(TAG, "setting view type"); + variableItemListView->type = VARIABLE_ITEM_LIST; + FURI_LOG_I(TAG, "moving on"); + + // Add views to the app context to be managed there + FURI_LOG_I(TAG, "Adding views to app context"); + AppContextStatus result = addViewToAppContext(appContext, sharedMenuView); + if(result != APP_CONTEXT_OK) { + FURI_LOG_E(TAG, "There was a problem adding the view %d!", sharedMenuView->viewId); + return -1; + } + + result = addViewToAppContext(appContext, submenuView); + if(result != APP_CONTEXT_OK) { + FURI_LOG_E(TAG, "There was a problem adding the view %d!", submenuView->viewId); + return -1; + } + + result = addViewToAppContext(appContext, playbackView); + if(result != APP_CONTEXT_OK) { + FURI_LOG_E(TAG, "There was a problem adding the view %d!", playbackView->viewId); + return -1; + } + + FURI_LOG_I(TAG, "Adding variable item list view"); + result = addViewToAppContext(appContext, variableItemListView); + if(result != APP_CONTEXT_OK) { + FURI_LOG_E(TAG, "There was a problem adding the view %d!", variableItemListView->viewId); + return -1; + } + + // On the playback view, ensure we only allocate for the model once + FURI_LOG_I(TAG, "allocating view model for playback"); + view_allocate_model(playbackView->viewData, ViewModelTypeLockFree, sizeof(struct ToneData_t)); + + return 0; +} + +int32_t tone_gen_app(void* p) { + UNUSED(p); + + FURI_LOG_I(TAG, "Tone gen app starting..."); + + struct AppContext_t* appContext; + AppContextStatus result = + initializeAppContext(&appContext, ToneGenAppView_count, &scene_event_handlers); + + if(result == APP_CONTEXT_OK) { + appContext->additionalData = malloc(sizeof(struct ToneData_t)); + ((struct ToneData_t*)appContext->additionalData)->animationOffset = 0; + ((struct ToneData_t*)appContext->additionalData)->frequency = 440; + ((struct ToneData_t*)appContext->additionalData)->waveType = SINE; + ((struct ToneData_t*)appContext->additionalData)->volume = 1.0f; + + result = setupViews(&appContext); + if(result == 0) { + // set the scene and launch the main loop + FURI_LOG_D(TAG, "Setting the scene"); + Gui* gui = furi_record_open(RECORD_GUI); + view_dispatcher_attach_to_gui( + appContext->view_dispatcher, gui, ViewDispatcherTypeFullscreen); + scene_manager_next_scene(appContext->scene_manager, ToneGenAppScene_Starting); + FURI_LOG_D(TAG, "Starting the view dispatcher"); + view_dispatcher_run(appContext->view_dispatcher); + } + + // free all memory + FURI_LOG_D(TAG, "Ending the app"); + furi_record_close(RECORD_GUI); + freeAppContext(&appContext); + return 0; + } + return -1; +} diff --git a/non_catalog_apps/tone_gen/src/tone_gen.h b/non_catalog_apps/tone_gen/src/tone_gen.h new file mode 100644 index 00000000000..789075dae09 --- /dev/null +++ b/non_catalog_apps/tone_gen/src/tone_gen.h @@ -0,0 +1,36 @@ +#ifndef _TONE_GEN_H_ + +#define _TONE_GEN_H_ + +#define TAG "tone-gen" + +#include + +// ids for all scenes used by the app +typedef enum { + ToneGenAppScene_Starting, + ToneGenAppScene_Playback, + ToneGenAppScene_Settings, + ToneGenAppScene_count +} ToneGenAppScene; + +// ids for the 2 types of view used by the app +typedef enum { + ToneGenAppView_SharedMenu, + ToneGenAppView_Submenu, + ToneGenAppView_VariableItemList, + ToneGenAppView_PlaybackView, + ToneGenAppView_Popup, + ToneGenAppView_count +} ToneGenAppView; + +typedef enum { SINE, SQUARE } ToneWaveType; + +struct ToneData_t { + int animationOffset; + ToneWaveType waveType; + uint16_t frequency; + float volume; +}; + +#endif diff --git a/non_catalog_apps/tone_gen/src/utils/linked_list.c b/non_catalog_apps/tone_gen/src/utils/linked_list.c new file mode 100644 index 00000000000..6655829941d --- /dev/null +++ b/non_catalog_apps/tone_gen/src/utils/linked_list.c @@ -0,0 +1,71 @@ +#include + +#include "linked_list.h" + +int getLength(const struct ListNode_t* root) { + int count = 0; + while(root) { + root = root->next; + count += 1; + } + + return count; +} + +LinkedListStatus + createNode(struct ListNode_t** emptyNode, struct ListNode_t* previousNode, void* data) { + *emptyNode = malloc(sizeof(struct ListNode_t)); + if(*emptyNode == 0) { + return LIST_CANT_ALLOCATE; + } + (*emptyNode)->data = data; + (*emptyNode)->previous = previousNode; + return LIST_OK; +} + +LinkedListStatus addNode(struct ListNode_t** root, void* data) { + // If there is no root node, add that first + if(*root == 0) { + return createNode(root, 0, data); + } + + // Iterate until we find an empty node + struct ListNode_t* base = *root; + while(base->next) { + base = base->next; + } + return createNode(&base->next, base, data); +} + +LinkedListStatus removeNode(struct ListNode_t** root, const void* data) { + if(*root == 0) { + return LIST_NO_NODE; + } + + struct ListNode_t* base = *root; + while(base->data != data && base->next) { + base = base->next; + } + + // Delete node if data is matching + if(base->data == data) { + (base->previous)->next = base->next; + (base->next)->previous = base->previous; + free(base); + return LIST_OK; + } + return LIST_NO_NODE; +} + +LinkedListStatus removeAllNodes(struct ListNode_t** root) { + struct ListNode_t* base = *root; + struct ListNode_t* temp; + while(base) { + temp = base; + base = base->next; + free(temp); + } + (*root) = NULL; + + return LIST_OK; +} diff --git a/non_catalog_apps/tone_gen/src/utils/linked_list.h b/non_catalog_apps/tone_gen/src/utils/linked_list.h new file mode 100644 index 00000000000..5d1a9de2b31 --- /dev/null +++ b/non_catalog_apps/tone_gen/src/utils/linked_list.h @@ -0,0 +1,23 @@ +#ifndef _LINKED_LIST_H_ + +#define _LINKED_LIST_H_ + +typedef enum { + LIST_OK = 0, + LIST_CANT_ALLOCATE = -1, + LIST_NO_NODE = -2, +} LinkedListStatus; + +struct ListNode_t { + struct ListNode_t* previous; + struct ListNode_t* next; + + void* data; +}; + +int getLength(const struct ListNode_t* root); +LinkedListStatus addNode(struct ListNode_t** root, void* data); +LinkedListStatus removeNode(struct ListNode_t** root, const void* data); +LinkedListStatus removeAllNodes(struct ListNode_t** root); + +#endif diff --git a/non_catalog_apps/tone_gen/tone_gen.png b/non_catalog_apps/tone_gen/tone_gen.png new file mode 100644 index 0000000000000000000000000000000000000000..a25311bbda78af41e23f836e7ce7c7608c337530 GIT binary patch literal 4231 zcmeH~eQXqE9>)jh(RB+b@?uq#=~OsTXJ=-2wzE5QTbA9vtg?Nf3)ZHjJUjDDJF>g8 z%uKu620VrGBJCv#oG+w$X9R`o9Rd|G3ISp(q>3bp_5vxKXD)4M4!r9{%0c9w+3m~r z&g9bM{I8qr%=7%7-+Z3m@B93oCo?aWl@!f1KVZf%Y^JZ+yAs`vw%IflU8j~+UPZU= zra+~>62$PRsz`DO;(B8g;xH~t7#6=6E_dI%nKm6C+>w_Bn4Nu{&({8HbKXhse*4kS z#TR-%-_iU*&!GF*!!s7WE|Eufi&?84;~r-l-+xHk`Ox|5>*;UKdg0fbV7z_NwO+q8Rw$RYjW4^3KUub*tEOTfF)zJkyGhz#(ojD8Ow|@5 zU^=?Ieb(YvpL6fp`bbw-d6aYv9j>g8uK(ui)2r@D%U@Q#rfu$;y`6U!ZJEzJyx_)n zy(iA}E?rg^culJBn&LlpPPb-BT6?g69%v2TGkd$Wqt)qq@^oxNZ}zF4k2BBzBmYKU zf5qVZX;X>yZTG+9Kkm-$kRNQj@nZHL9%=9F>zuQA%}YZs59~Ojw6$0=a&1BB%fZgs z!NY$#{bYK_&I7Yc=M=5-zq=u8;Ba?iOULR1hre;%%=n~nBYb^;EqbYwcm;PiZ+f76 z|Ea>()o;wrkS~@F4Q*R<(rejL4Qcg>-OMGk?~=LZ zQ@8HlSTQT}!(TM@9KT$3%dru&URZT?y2Fw7Y0K^t*9Nb>`NicQU0+?jo__L*+LgBF zuD4O~HOZ*RD*Y>XK?z%cs05)U9*&~w!?4`^coYchppFM&tsHR?*FQc<;IilP*dtv0TwjCh@PE_DDwHsMhQkrwQ@L`ND7HJ zZZc6A^^4Z4p@fepP%s3;2&$p@m~sBPERBgZE;eH%kxptLXu47UIPa0%6VAxX@8`XW zP;X4?^STHlUS3oLS>zK9{>FqUxuq)L`eZNJ4ateUgyV@_!2=#2r@t*bDVaOWNFBe4!gvWc9s!2TI8%w;Xmk_ zBIz-pLU%3F5ov|$Gocm!XmSacj1MMO2aWYXijhdAF~w}dic!NEQ^u(=l5#HfU!vqD z98!)M^jy-0jxTf?QlrP=uxQ4?^E3X27vpD~0ih=+nUKDda!txLAq6JnJXu|na!p8q z2{}(z*Z)l}^VkO!jG)(`82Vfi&3`6?NU^ZRgIOZI*HCeb_}$_U+1c)87#W^A(hM4=!K3>EGuj>VW_N literal 0 HcmV?d00001