diff --git a/base_pack/nfc_maker/LICENSE b/base_pack/nfc_maker/LICENSE
new file mode 100644
index 00000000000..f288702d2fa
--- /dev/null
+++ b/base_pack/nfc_maker/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/base_pack/nfc_maker/application.fam b/base_pack/nfc_maker/application.fam
index 95bcd8878b5..06896f2c957 100644
--- a/base_pack/nfc_maker/application.fam
+++ b/base_pack/nfc_maker/application.fam
@@ -3,13 +3,12 @@ App(
name="NFC Maker",
apptype=FlipperAppType.EXTERNAL,
entry_point="nfc_maker",
- cdefines=["APP_NFC_MAKER"],
- requires=[
- "storage",
- "gui",
- ],
stack_size=1 * 1024,
fap_icon="nfc_maker_10px.png",
fap_category="NFC",
fap_icon_assets="assets",
+ fap_author="@Willy-JL",
+ fap_weburl="https://github.com/Flipper-XFW/Xtreme-Apps/tree/dev/nfc_maker",
+ fap_version="1.1",
+ fap_description="Create NFC files for BT MACs, Contacts, Links, Emails, Phones, Text and WiFis",
)
diff --git a/base_pack/nfc_maker/nfc_maker.c b/base_pack/nfc_maker/nfc_maker.c
index 33261424849..577af3d5736 100644
--- a/base_pack/nfc_maker/nfc_maker.c
+++ b/base_pack/nfc_maker/nfc_maker.c
@@ -1,5 +1,30 @@
#include "nfc_maker.h"
+const NfcDataGeneratorType ntag_generators[NtagMAX] = {
+ [Ntag203] = NfcDataGeneratorTypeNTAG203,
+ [Ntag213] = NfcDataGeneratorTypeNTAG213,
+ [Ntag215] = NfcDataGeneratorTypeNTAG215,
+ [Ntag216] = NfcDataGeneratorTypeNTAG216,
+ [NtagI2C1K] = NfcDataGeneratorTypeNTAGI2C1k,
+ [NtagI2C2K] = NfcDataGeneratorTypeNTAGI2C2k,
+};
+const char* ntag_names[NtagMAX] = {
+ [Ntag203] = "NTAG203",
+ [Ntag213] = "NTAG213",
+ [Ntag215] = "NTAG215",
+ [Ntag216] = "NTAG216",
+ [NtagI2C1K] = "NTAG I2C 1K",
+ [NtagI2C2K] = "NTAG I2C 2K",
+};
+const size_t ntag_sizes[NtagMAX] = {
+ [Ntag203] = 0x12 * NTAG_DATA_AREA_UNIT_SIZE,
+ [Ntag213] = 0x12 * NTAG_DATA_AREA_UNIT_SIZE,
+ [Ntag215] = 0x3E * NTAG_DATA_AREA_UNIT_SIZE,
+ [Ntag216] = 0x6D * NTAG_DATA_AREA_UNIT_SIZE,
+ [NtagI2C1K] = 0x6D * NTAG_DATA_AREA_UNIT_SIZE,
+ [NtagI2C2K] = 0xEA * NTAG_DATA_AREA_UNIT_SIZE,
+};
+
static bool nfc_maker_custom_event_callback(void* context, uint32_t event) {
furi_assert(context);
NfcMaker* app = context;
@@ -48,12 +73,20 @@ NfcMaker* nfc_maker_alloc() {
app->popup = popup_alloc();
view_dispatcher_add_view(app->view_dispatcher, NfcMakerViewPopup, popup_get_view(app->popup));
+ // Nfc Device
+ app->nfc_device = nfc_device_alloc();
+ app->ndef_buffer = malloc(MAX_NDEF_LEN);
+
return app;
}
void nfc_maker_free(NfcMaker* app) {
furi_assert(app);
+ // Nfc Device
+ nfc_device_free(app->nfc_device);
+ free(app->ndef_buffer);
+
// Gui modules
view_dispatcher_remove_view(app->view_dispatcher, NfcMakerViewSubmenu);
submenu_free(app->submenu);
diff --git a/base_pack/nfc_maker/nfc_maker.h b/base_pack/nfc_maker/nfc_maker.h
index ff988bdec05..fc231fbe51e 100644
--- a/base_pack/nfc_maker/nfc_maker.h
+++ b/base_pack/nfc_maker/nfc_maker.h
@@ -1,3 +1,6 @@
+#pragma once
+
+#include
#include
#include
#include
@@ -14,6 +17,11 @@
#include
#include "newstrnlen.h"
+#include
+#include
+#include
+#include
+
#define NFC_MK_APP_FOLDER EXT_PATH("nfc")
#define NFC_MK_APP_EXTENSION ".nfc"
@@ -24,6 +32,21 @@
#define BIG_INPUT_LEN 248
#define SMALL_INPUT_LEN 90
+#define NTAG_DATA_AREA_UNIT_SIZE 2 * MF_ULTRALIGHT_PAGE_SIZE
+typedef enum {
+ Ntag203,
+ Ntag213,
+ Ntag215,
+ Ntag216,
+ NtagI2C1K,
+ NtagI2C2K,
+ NtagMAX,
+} Ntag;
+extern const NfcDataGeneratorType ntag_generators[NtagMAX];
+extern const char* ntag_names[NtagMAX];
+extern const size_t ntag_sizes[NtagMAX];
+#define MAX_NDEF_LEN ntag_sizes[NtagI2C2K]
+
typedef enum {
WifiAuthenticationOpen = 0x01,
WifiAuthenticationWpa2Personal = 0x20,
@@ -49,6 +72,9 @@ typedef struct {
ByteInput* byte_input;
Popup* popup;
+ NfcDevice* nfc_device;
+ uint8_t* ndef_buffer;
+
uint8_t mac_buf[MAC_INPUT_LEN];
char mail_buf[MAIL_INPUT_LEN];
char phone_buf[PHONE_INPUT_LEN];
diff --git a/base_pack/nfc_maker/scenes/nfc_maker_scene_bluetooth.c b/base_pack/nfc_maker/scenes/nfc_maker_scene_bluetooth.c
index e392ea096bb..ba60cb86640 100644
--- a/base_pack/nfc_maker/scenes/nfc_maker_scene_bluetooth.c
+++ b/base_pack/nfc_maker/scenes/nfc_maker_scene_bluetooth.c
@@ -40,7 +40,7 @@ bool nfc_maker_scene_bluetooth_on_event(void* context, SceneManagerEvent event)
switch(event.event) {
case ByteInputResultOk:
furi_hal_bt_reverse_mac_addr(app->mac_buf);
- scene_manager_next_scene(app->scene_manager, NfcMakerSceneSave);
+ scene_manager_next_scene(app->scene_manager, NfcMakerSceneSaveGenerate);
break;
default:
break;
diff --git a/base_pack/nfc_maker/scenes/nfc_maker_scene_config.h b/base_pack/nfc_maker/scenes/nfc_maker_scene_config.h
index 0ef4f021f6a..5d81042fdcf 100644
--- a/base_pack/nfc_maker/scenes/nfc_maker_scene_config.h
+++ b/base_pack/nfc_maker/scenes/nfc_maker_scene_config.h
@@ -14,5 +14,6 @@ ADD_SCENE(nfc_maker, wifi, Wifi)
ADD_SCENE(nfc_maker, wifi_auth, WifiAuth)
ADD_SCENE(nfc_maker, wifi_encr, WifiEncr)
ADD_SCENE(nfc_maker, wifi_pass, WifiPass)
-ADD_SCENE(nfc_maker, save, Save)
-ADD_SCENE(nfc_maker, result, Result)
+ADD_SCENE(nfc_maker, save_generate, SaveGenerate)
+ADD_SCENE(nfc_maker, save_name, SaveName)
+ADD_SCENE(nfc_maker, save_result, SaveResult)
diff --git a/base_pack/nfc_maker/scenes/nfc_maker_scene_contact_url.c b/base_pack/nfc_maker/scenes/nfc_maker_scene_contact_url.c
index 97ffd18c190..5ea22a32e89 100644
--- a/base_pack/nfc_maker/scenes/nfc_maker_scene_contact_url.c
+++ b/base_pack/nfc_maker/scenes/nfc_maker_scene_contact_url.c
@@ -39,7 +39,7 @@ bool nfc_maker_scene_contact_url_on_event(void* context, SceneManagerEvent event
consumed = true;
switch(event.event) {
case TextInputResultOk:
- scene_manager_next_scene(app->scene_manager, NfcMakerSceneSave);
+ scene_manager_next_scene(app->scene_manager, NfcMakerSceneSaveGenerate);
break;
default:
break;
diff --git a/base_pack/nfc_maker/scenes/nfc_maker_scene_https.c b/base_pack/nfc_maker/scenes/nfc_maker_scene_https.c
index 98411f73f4f..3ba03715f83 100644
--- a/base_pack/nfc_maker/scenes/nfc_maker_scene_https.c
+++ b/base_pack/nfc_maker/scenes/nfc_maker_scene_https.c
@@ -37,7 +37,7 @@ bool nfc_maker_scene_https_on_event(void* context, SceneManagerEvent event) {
consumed = true;
switch(event.event) {
case TextInputResultOk:
- scene_manager_next_scene(app->scene_manager, NfcMakerSceneSave);
+ scene_manager_next_scene(app->scene_manager, NfcMakerSceneSaveGenerate);
break;
default:
break;
diff --git a/base_pack/nfc_maker/scenes/nfc_maker_scene_mail.c b/base_pack/nfc_maker/scenes/nfc_maker_scene_mail.c
index 0cb4c3d7e75..d100d45cb63 100644
--- a/base_pack/nfc_maker/scenes/nfc_maker_scene_mail.c
+++ b/base_pack/nfc_maker/scenes/nfc_maker_scene_mail.c
@@ -37,7 +37,7 @@ bool nfc_maker_scene_mail_on_event(void* context, SceneManagerEvent event) {
consumed = true;
switch(event.event) {
case TextInputResultOk:
- scene_manager_next_scene(app->scene_manager, NfcMakerSceneSave);
+ scene_manager_next_scene(app->scene_manager, NfcMakerSceneSaveGenerate);
break;
default:
break;
diff --git a/base_pack/nfc_maker/scenes/nfc_maker_scene_phone.c b/base_pack/nfc_maker/scenes/nfc_maker_scene_phone.c
index 68cbeab8414..94e64f09756 100644
--- a/base_pack/nfc_maker/scenes/nfc_maker_scene_phone.c
+++ b/base_pack/nfc_maker/scenes/nfc_maker_scene_phone.c
@@ -37,7 +37,7 @@ bool nfc_maker_scene_phone_on_event(void* context, SceneManagerEvent event) {
consumed = true;
switch(event.event) {
case TextInputResultOk:
- scene_manager_next_scene(app->scene_manager, NfcMakerSceneSave);
+ scene_manager_next_scene(app->scene_manager, NfcMakerSceneSaveGenerate);
break;
default:
break;
diff --git a/base_pack/nfc_maker/scenes/nfc_maker_scene_result.c b/base_pack/nfc_maker/scenes/nfc_maker_scene_result.c
deleted file mode 100644
index 9236572decf..00000000000
--- a/base_pack/nfc_maker/scenes/nfc_maker_scene_result.c
+++ /dev/null
@@ -1,406 +0,0 @@
-#include "../nfc_maker.h"
-#include
-
-enum PopupEvent {
- PopupEventExit,
-};
-
-static void nfc_maker_scene_result_popup_callback(void* context) {
- NfcMaker* app = context;
-
- view_dispatcher_send_custom_event(app->view_dispatcher, PopupEventExit);
-}
-
-void nfc_maker_scene_result_on_enter(void* context) {
- NfcMaker* app = context;
- Popup* popup = app->popup;
- bool success = false;
-
- FlipperFormat* file = flipper_format_file_alloc(furi_record_open(RECORD_STORAGE));
- FuriString* path = furi_string_alloc();
- furi_string_printf(path, NFC_MK_APP_FOLDER "/%s" NFC_MK_APP_EXTENSION, app->save_buf);
-
- uint32_t pages = 135;
- size_t size = pages * 4;
- uint8_t* buf = malloc(size);
- do {
- if(!flipper_format_file_open_new(file, furi_string_get_cstr(path))) break;
-
- if(!flipper_format_write_header_cstr(file, "Flipper NFC device", 4)) break;
- if(!flipper_format_write_string_cstr(file, "Device type", "NTAG/Ultralight")) break;
-
- // Serial number
- size_t i = 0;
- buf[i++] = 0x04;
- furi_hal_random_fill_buf(&buf[i], 8);
- i += 8;
- uint8_t uid[7];
- memcpy(&uid[0], &buf[0], 3);
- memcpy(&uid[3], &buf[4], 4);
-
- if(!flipper_format_write_hex(file, "UID", uid, sizeof(uid))) break;
- if(!flipper_format_write_string_cstr(file, "ATQA", "00 44")) break;
- if(!flipper_format_write_string_cstr(file, "SAK", "00")) break;
- if(!flipper_format_write_string_cstr(file, "Data format version", "2")) break;
- if(!flipper_format_write_string_cstr(file, "NTAG/Ultralight type", "NTAG215")) break;
- // TODO: Maybe randomize?
- if(!flipper_format_write_string_cstr(
- file,
- "Signature",
- "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00"))
- break;
- if(!flipper_format_write_string_cstr(file, "Mifare version", "00 04 04 02 01 00 11 03"))
- break;
-
- if(!flipper_format_write_string_cstr(file, "Counter 0", "0")) break;
- if(!flipper_format_write_string_cstr(file, "Tearing 0", "00")) break;
- if(!flipper_format_write_string_cstr(file, "Counter 1", "0")) break;
- if(!flipper_format_write_string_cstr(file, "Tearing 1", "00")) break;
- if(!flipper_format_write_string_cstr(file, "Counter 2", "0")) break;
- if(!flipper_format_write_string_cstr(file, "Tearing 2", "00")) break;
- if(!flipper_format_write_uint32(file, "Pages total", &pages, 1)) break;
- if(!flipper_format_write_uint32(file, "Pages read", &pages, 1)) break;
-
- // Static data
- buf[i++] = 0x48; // Internal
- buf[i++] = 0x00; // Lock bytes
- buf[i++] = 0x00; // ...
-
- buf[i++] = 0xE1; // Capability container
- buf[i++] = 0x10; // ...
- buf[i++] = 0x3E; // ...
- buf[i++] = 0x00; // ...
-
- buf[i++] = 0x03; // NDEF TLV block
-
- // NDEF Docs: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/protocols/nfc/index.html#nfc-data-exchange-format-ndef
- uint8_t tnf = 0x00;
- const char* type = "";
- uint8_t* payload = NULL;
- size_t payload_len = 0;
-
- size_t data_len = 0;
- size_t j = 0;
- switch(scene_manager_get_scene_state(app->scene_manager, NfcMakerSceneStart)) {
- case NfcMakerSceneBluetooth: {
- tnf = 0x02; // Media-type [RFC 2046]
- type = "application/vnd.bluetooth.ep.oob";
-
- data_len = MAC_INPUT_LEN;
- payload_len = data_len + 2;
- payload = malloc(payload_len);
-
- payload[j++] = 0x08;
- payload[j++] = 0x00;
- memcpy(&payload[j], app->mac_buf, data_len);
- j += data_len;
- break;
- }
- case NfcMakerSceneContact: {
- tnf = 0x02; // Media-type [RFC 2046]
- type = "text/vcard";
-
- FuriString* vcard = furi_string_alloc_set("BEGIN:VCARD\r\nVERSION:3.0\r\n");
- furi_string_cat_printf(
- vcard, "PRODID:-//Flipper Zero//%s//EN\r\n", version_get_version(NULL));
- furi_string_cat_printf(vcard, "N:%s;%s;;;\r\n", app->small_buf2, app->small_buf1);
- furi_string_cat_printf(
- vcard,
- "FN:%s%s%s\r\n",
- app->small_buf1,
- newstrnlen(app->small_buf2, SMALL_INPUT_LEN) ? " " : "",
- app->small_buf2);
- if(newstrnlen(app->mail_buf, MAIL_INPUT_LEN)) {
- furi_string_cat_printf(vcard, "EMAIL:%s\r\n", app->mail_buf);
- }
- if(newstrnlen(app->phone_buf, PHONE_INPUT_LEN)) {
- furi_string_cat_printf(vcard, "TEL:%s\r\n", app->phone_buf);
- }
- if(newstrnlen(app->big_buf, BIG_INPUT_LEN)) {
- furi_string_cat_printf(vcard, "URL:%s\r\n", app->big_buf);
- }
- furi_string_cat_printf(vcard, "END:VCARD\r\n");
-
- payload_len = furi_string_size(vcard);
- payload = malloc(payload_len);
- memcpy(payload, furi_string_get_cstr(vcard), payload_len);
- furi_string_free(vcard);
- break;
- }
- case NfcMakerSceneHttps: {
- tnf = 0x01; // NFC Forum well-known type [NFC RTD]
- type = "U";
-
- data_len = newstrnlen(app->big_buf, BIG_INPUT_LEN);
- payload_len = data_len + 1;
- payload = malloc(payload_len);
-
- payload[j++] = 0x04; // Prepend "https://"
- memcpy(&payload[j], app->big_buf, data_len);
- j += data_len;
- break;
- }
- case NfcMakerSceneMail: {
- tnf = 0x01; // NFC Forum well-known type [NFC RTD]
- type = "U";
-
- data_len = newstrnlen(app->mail_buf, MAIL_INPUT_LEN);
- payload_len = data_len + 1;
- payload = malloc(payload_len);
-
- payload[j++] = 0x06; // Prepend "mailto:"
- memcpy(&payload[j], app->mail_buf, data_len);
- j += data_len;
- break;
- }
- case NfcMakerScenePhone: {
- tnf = 0x01; // NFC Forum well-known type [NFC RTD]
- type = "U";
-
- data_len = newstrnlen(app->phone_buf, PHONE_INPUT_LEN);
- payload_len = data_len + 1;
- payload = malloc(payload_len);
-
- payload[j++] = 0x05; // Prepend "tel:"
- memcpy(&payload[j], app->phone_buf, data_len);
- j += data_len;
- break;
- }
- case NfcMakerSceneText: {
- tnf = 0x01; // NFC Forum well-known type [NFC RTD]
- type = "T";
-
- data_len = newstrnlen(app->big_buf, BIG_INPUT_LEN);
- payload_len = data_len + 3;
- payload = malloc(payload_len);
-
- payload[j++] = 0x02;
- payload[j++] = 'e';
- payload[j++] = 'n';
- memcpy(&payload[j], app->big_buf, data_len);
- j += data_len;
- break;
- }
- case NfcMakerSceneUrl: {
- tnf = 0x01; // NFC Forum well-known type [NFC RTD]
- type = "U";
-
- data_len = newstrnlen(app->big_buf, BIG_INPUT_LEN);
- payload_len = data_len + 1;
- payload = malloc(payload_len);
-
- payload[j++] = 0x00; // No prepend
- memcpy(&payload[j], app->big_buf, data_len);
- j += data_len;
- break;
- }
- case NfcMakerSceneWifi: {
- tnf = 0x02; // Media-type [RFC 2046]
- type = "application/vnd.wfa.wsc";
-
- uint8_t ssid_len = newstrnlen(app->small_buf1, SMALL_INPUT_LEN);
- uint8_t pass_len = newstrnlen(app->small_buf2, SMALL_INPUT_LEN);
- uint8_t data_len = ssid_len + pass_len;
- payload_len = data_len + 39;
- payload = malloc(payload_len);
-
- payload[j++] = 0x10;
- payload[j++] = 0x0E;
- payload[j++] = 0x00;
-
- payload[j++] = data_len + 43;
- payload[j++] = 0x10;
- payload[j++] = 0x26;
- payload[j++] = 0x00;
-
- payload[j++] = 0x01;
- payload[j++] = 0x01;
- payload[j++] = 0x10;
- payload[j++] = 0x45;
-
- payload[j++] = 0x00;
- payload[j++] = ssid_len;
- memcpy(&payload[j], app->small_buf1, ssid_len);
- j += ssid_len;
- payload[j++] = 0x10;
- payload[j++] = 0x03;
-
- payload[j++] = 0x00;
- payload[j++] = 0x02;
- payload[j++] = 0x00;
- payload[j++] =
- scene_manager_get_scene_state(app->scene_manager, NfcMakerSceneWifiAuth);
-
- payload[j++] = 0x10;
- payload[j++] = 0x0F;
- payload[j++] = 0x00;
- payload[j++] = 0x02;
-
- payload[j++] = 0x00;
- payload[j++] =
- scene_manager_get_scene_state(app->scene_manager, NfcMakerSceneWifiEncr);
- payload[j++] = 0x10;
- payload[j++] = 0x27;
-
- payload[j++] = 0x00;
- payload[j++] = pass_len;
- memcpy(&payload[j], app->small_buf2, pass_len);
- j += pass_len;
- payload[j++] = 0x10;
- payload[j++] = 0x20;
-
- payload[j++] = 0x00;
- payload[j++] = 0x06;
- payload[j++] = 0xFF;
- payload[j++] = 0xFF;
-
- payload[j++] = 0xFF;
- payload[j++] = 0xFF;
- payload[j++] = 0xFF;
- payload[j++] = 0xFF;
-
- break;
- }
- default:
- break;
- }
-
- // Record header
- uint8_t flags = 0;
- flags |= 1 << 7; // MB (Message Begin)
- flags |= 1 << 6; // ME (Message End)
- flags |= tnf; // TNF (Type Name Format)
- size_t type_len = strlen(type);
-
- size_t header_len = 0;
- header_len += 1; // Flags and TNF
- header_len += 1; // Type length
- if(payload_len < 0xFF) {
- flags |= 1 << 4; // SR (Short Record)
- header_len += 1; // Payload length
- } else {
- header_len += 4; // Payload length
- }
- header_len += type_len; // Payload type
-
- size_t record_len = header_len + payload_len;
- if(record_len < 0xFF) {
- buf[i++] = record_len; // TLV length
- } else {
- buf[i++] = 0xFF; // TLV length
- buf[i++] = record_len >> 8; // ...
- buf[i++] = record_len & 0xFF; // ...
- }
- buf[i++] = flags; // Flags and TNF
- buf[i++] = type_len; // Type length
- if(flags & (1 << 4)) { // SR (Short Record)
- buf[i++] = payload_len; // Payload length
- } else {
- buf[i++] = 0x00; // Payload length
- buf[i++] = 0x00; // ...
- buf[i++] = payload_len >> 8; // ...
- buf[i++] = payload_len & 0xFF; // ...
- }
- memcpy(&buf[i], type, type_len); // Payload type
- i += type_len;
-
- // Record payload
- memcpy(&buf[i], payload, payload_len);
- i += payload_len;
- free(payload);
-
- // Record terminator
- buf[i++] = 0xFE;
-
- // Padding until last 5 pages
- for(; i < size - 20; i++) {
- buf[i] = 0x00;
- }
-
- // Last 5 static pages
- buf[i++] = 0x00;
- buf[i++] = 0x00;
- buf[i++] = 0x00;
- buf[i++] = 0xBD;
-
- buf[i++] = 0x04;
- buf[i++] = 0x00;
- buf[i++] = 0x00;
- buf[i++] = 0xFF;
-
- buf[i++] = 0x00;
- buf[i++] = 0x05;
- buf[i++] = 0x00;
- buf[i++] = 0x00;
-
- buf[i++] = 0xFF;
- buf[i++] = 0xFF;
- buf[i++] = 0xFF;
- buf[i++] = 0xFF;
-
- buf[i++] = 0x00;
- buf[i++] = 0x00;
- buf[i++] = 0x00;
- buf[i++] = 0x00;
-
- // Write pages
- char str[16];
- bool ok = true;
- for(size_t page = 0; page < pages; page++) {
- snprintf(str, sizeof(str), "Page %u", page);
- if(!flipper_format_write_hex(file, str, &buf[page * 4], 4)) {
- ok = false;
- break;
- }
- }
- if(!ok) break;
-
- if(!flipper_format_write_string_cstr(file, "Failed authentication attempts", "0")) break;
-
- success = true;
-
- } while(false);
- free(buf);
-
- furi_string_free(path);
- flipper_format_free(file);
- furi_record_close(RECORD_STORAGE);
-
- if(success) {
- popup_set_icon(popup, 36, 5, &I_DolphinDone_80x58);
- popup_set_header(popup, "Saved!", 13, 22, AlignLeft, AlignBottom);
- } else {
- popup_set_icon(popup, 69, 15, &I_WarningDolphinFlip_45x42);
- popup_set_header(popup, "Error!", 13, 22, AlignLeft, AlignBottom);
- }
- popup_set_timeout(popup, 1500);
- popup_set_context(popup, app);
- popup_set_callback(popup, nfc_maker_scene_result_popup_callback);
- popup_enable_timeout(popup);
-
- view_dispatcher_switch_to_view(app->view_dispatcher, NfcMakerViewPopup);
-}
-
-bool nfc_maker_scene_result_on_event(void* context, SceneManagerEvent event) {
- NfcMaker* app = context;
- bool consumed = false;
-
- if(event.type == SceneManagerEventTypeCustom) {
- consumed = true;
- switch(event.event) {
- case PopupEventExit:
- scene_manager_search_and_switch_to_previous_scene(
- app->scene_manager, NfcMakerSceneStart);
- break;
- default:
- break;
- }
- }
-
- return consumed;
-}
-
-void nfc_maker_scene_result_on_exit(void* context) {
- NfcMaker* app = context;
- popup_reset(app->popup);
-}
diff --git a/base_pack/nfc_maker/scenes/nfc_maker_scene_save_generate.c b/base_pack/nfc_maker/scenes/nfc_maker_scene_save_generate.c
new file mode 100644
index 00000000000..048d5c9348e
--- /dev/null
+++ b/base_pack/nfc_maker/scenes/nfc_maker_scene_save_generate.c
@@ -0,0 +1,332 @@
+#include "../nfc_maker.h"
+
+size_t nfc_maker_scene_save_generate_populate_ndef_buffer(NfcMaker* app) {
+ // NDEF Docs: https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/protocols/nfc/index.html#nfc-data-exchange-format-ndef
+ uint8_t tnf = 0x00;
+ const char* type = "";
+ uint8_t* payload = NULL;
+ uint8_t* payload_it = NULL;
+ size_t payload_len = 0;
+
+ size_t data_len = 0;
+ switch(scene_manager_get_scene_state(app->scene_manager, NfcMakerSceneStart)) {
+ case NfcMakerSceneBluetooth: {
+ tnf = 0x02; // Media-type [RFC 2046]
+ type = "application/vnd.bluetooth.ep.oob";
+
+ data_len = MAC_INPUT_LEN;
+ payload_len = data_len + 2;
+ payload = payload_it = malloc(payload_len);
+
+ *payload_it++ = 0x08;
+ *payload_it++ = 0x00;
+ memcpy(payload_it, app->mac_buf, data_len);
+ payload_it += data_len;
+ break;
+ }
+ case NfcMakerSceneContact: {
+ tnf = 0x02; // Media-type [RFC 2046]
+ type = "text/vcard";
+
+ FuriString* vcard = furi_string_alloc_set("BEGIN:VCARD\r\nVERSION:3.0\r\n");
+ furi_string_cat_printf(
+ vcard, "PRODID:-//Flipper Zero//%s//EN\r\n", version_get_version(NULL));
+ furi_string_cat_printf(vcard, "N:%s;%s;;;\r\n", app->small_buf2, app->small_buf1);
+ furi_string_cat_printf(
+ vcard,
+ "FN:%s%s%s\r\n",
+ app->small_buf1,
+ newstrnlen(app->small_buf2, SMALL_INPUT_LEN) ? " " : "",
+ app->small_buf2);
+ if(newstrnlen(app->mail_buf, MAIL_INPUT_LEN)) {
+ furi_string_cat_printf(vcard, "EMAIL:%s\r\n", app->mail_buf);
+ }
+ if(newstrnlen(app->phone_buf, PHONE_INPUT_LEN)) {
+ furi_string_cat_printf(vcard, "TEL:%s\r\n", app->phone_buf);
+ }
+ if(newstrnlen(app->big_buf, BIG_INPUT_LEN)) {
+ furi_string_cat_printf(vcard, "URL:%s\r\n", app->big_buf);
+ }
+ furi_string_cat_printf(vcard, "END:VCARD\r\n");
+
+ payload_len = furi_string_size(vcard);
+ payload = payload_it = malloc(payload_len);
+ memcpy(payload_it, furi_string_get_cstr(vcard), payload_len);
+ payload_it += payload_len;
+ furi_string_free(vcard);
+ break;
+ }
+ case NfcMakerSceneHttps: {
+ tnf = 0x01; // NFC Forum well-known type [NFC RTD]
+ type = "U";
+
+ data_len = newstrnlen(app->big_buf, BIG_INPUT_LEN);
+ payload_len = data_len + 1;
+ payload = payload_it = malloc(payload_len);
+
+ *payload_it++ = 0x04; // Prepend "https://"
+ memcpy(payload_it, app->big_buf, data_len);
+ payload_it += data_len;
+ break;
+ }
+ case NfcMakerSceneMail: {
+ tnf = 0x01; // NFC Forum well-known type [NFC RTD]
+ type = "U";
+
+ data_len = newstrnlen(app->mail_buf, MAIL_INPUT_LEN);
+ payload_len = data_len + 1;
+ payload = payload_it = malloc(payload_len);
+
+ *payload_it++ = 0x06; // Prepend "mailto:"
+ memcpy(payload_it, app->mail_buf, data_len);
+ payload_it += data_len;
+ break;
+ }
+ case NfcMakerScenePhone: {
+ tnf = 0x01; // NFC Forum well-known type [NFC RTD]
+ type = "U";
+
+ data_len = newstrnlen(app->phone_buf, PHONE_INPUT_LEN);
+ payload_len = data_len + 1;
+ payload = payload_it = malloc(payload_len);
+
+ *payload_it++ = 0x05; // Prepend "tel:"
+ memcpy(payload_it, app->phone_buf, data_len);
+ payload_it += data_len;
+ break;
+ }
+ case NfcMakerSceneText: {
+ tnf = 0x01; // NFC Forum well-known type [NFC RTD]
+ type = "T";
+
+ data_len = newstrnlen(app->big_buf, BIG_INPUT_LEN);
+ payload_len = data_len + 3;
+ payload = payload_it = malloc(payload_len);
+
+ *payload_it++ = 0x02;
+ *payload_it++ = 'e';
+ *payload_it++ = 'n';
+ memcpy(payload_it, app->big_buf, data_len);
+ payload_it += data_len;
+ break;
+ }
+ case NfcMakerSceneUrl: {
+ tnf = 0x01; // NFC Forum well-known type [NFC RTD]
+ type = "U";
+
+ data_len = newstrnlen(app->big_buf, BIG_INPUT_LEN);
+ payload_len = data_len + 1;
+ payload = payload_it = malloc(payload_len);
+
+ *payload_it++ = 0x00; // No prepend
+ memcpy(payload_it, app->big_buf, data_len);
+ payload_it += data_len;
+ break;
+ }
+ case NfcMakerSceneWifi: {
+ tnf = 0x02; // Media-type [RFC 2046]
+ type = "application/vnd.wfa.wsc";
+
+ // https://android.googlesource.com/platform/packages/apps/Nfc/+/refs/heads/main/src/com/android/nfc/NfcWifiProtectedSetup.java
+ // https://github.com/bparmentier/WiFiKeyShare/blob/master/app/src/main/java/be/brunoparmentier/wifikeyshare/utils/NfcUtils.java
+ uint8_t ssid_len = newstrnlen(app->small_buf1, SMALL_INPUT_LEN);
+ uint8_t pass_len = newstrnlen(app->small_buf2, SMALL_INPUT_LEN);
+ uint8_t data_len = ssid_len + pass_len;
+ payload_len = data_len + 39;
+ payload = payload_it = malloc(payload_len);
+
+ // CREDENTIAL_FIELD_ID
+ *payload_it++ = 0x10;
+ *payload_it++ = 0x0E;
+ // CREDENTIAL_FIELD_LEN
+ *payload_it++ = 0x00;
+ *payload_it++ = data_len + 35;
+ // CREDENTIAL_FIELD (contains all subsequent fields)
+
+ // NETWORK_INDEX_FIELD_ID
+ *payload_it++ = 0x10;
+ *payload_it++ = 0x26;
+ // NETWORK_INDEX_FIELD_LEN
+ *payload_it++ = 0x00;
+ *payload_it++ = 0x01;
+ // NETWORK_INDEX_FIELD
+ *payload_it++ = 0x01;
+
+ // SSID_FIELD_ID
+ *payload_it++ = 0x10;
+ *payload_it++ = 0x45;
+ // SSID_FIELD_LEN
+ *payload_it++ = ssid_len >> 8 & 0xFF;
+ *payload_it++ = ssid_len & 0xFF;
+ // SSID_FIELD
+ memcpy(payload_it, app->small_buf1, ssid_len);
+ payload_it += ssid_len;
+
+ // AUTH_TYPE_FIELD_ID
+ *payload_it++ = 0x10;
+ *payload_it++ = 0x03;
+ // AUTH_TYPE_FIELD_LEN
+ *payload_it++ = 0x00;
+ *payload_it++ = 0x02;
+ // AUTH_TYPE_FIELD
+ *payload_it++ = 0x00;
+ *payload_it++ = scene_manager_get_scene_state(app->scene_manager, NfcMakerSceneWifiAuth);
+
+ // ENC_TYPE_FIELD_ID
+ *payload_it++ = 0x10;
+ *payload_it++ = 0x0F;
+ // ENC_TYPE_FIELD_LEN
+ *payload_it++ = 0x00;
+ *payload_it++ = 0x02;
+ // ENC_TYPE_FIELD
+ *payload_it++ = 0x00;
+ *payload_it++ = scene_manager_get_scene_state(app->scene_manager, NfcMakerSceneWifiEncr);
+
+ // NETWORK_KEY_FIELD_ID
+ *payload_it++ = 0x10;
+ *payload_it++ = 0x27;
+ // NETWORK_KEY_FIELD_LEN
+ *payload_it++ = pass_len >> 8 & 0xFF;
+ *payload_it++ = pass_len & 0xFF;
+ // NETWORK_KEY_FIELD
+ memcpy(payload_it, app->small_buf2, pass_len);
+ payload_it += pass_len;
+
+ // MAC_ADDRESS_FIELD_ID
+ *payload_it++ = 0x10;
+ *payload_it++ = 0x20;
+ // MAC_ADDRESS_FIELD_LEN
+ *payload_it++ = 0x00;
+ *payload_it++ = 0x06;
+ // MAC_ADDRESS_FIELD
+ *payload_it++ = 0xFF;
+ *payload_it++ = 0xFF;
+ *payload_it++ = 0xFF;
+ *payload_it++ = 0xFF;
+ *payload_it++ = 0xFF;
+ *payload_it++ = 0xFF;
+
+ break;
+ }
+ default:
+ break;
+ }
+
+ // Setup header
+ uint8_t flags = 0;
+ flags |= 1 << 7; // MB (Message Begin)
+ flags |= 1 << 6; // ME (Message End)
+ flags |= tnf; // TNF (Type Name Format)
+ size_t type_len = strlen(type);
+
+ size_t header_len = 0;
+ header_len += 1; // Flags and TNF
+ header_len += 1; // Type length
+ if(payload_len < 0xFF) {
+ flags |= 1 << 4; // SR (Short Record)
+ header_len += 1; // Payload length
+ } else {
+ header_len += 4; // Payload length
+ }
+ header_len += type_len; // Payload type
+
+ // Start consolidating into NDEF buffer
+ memset(app->ndef_buffer, 0, MAX_NDEF_LEN);
+ uint8_t* buf = app->ndef_buffer;
+
+ // NDEF TLV block
+ *buf++ = 0x03; // TLV type
+ size_t record_len = header_len + payload_len;
+ if(record_len < 0xFF) {
+ *buf++ = record_len; // TLV length
+ } else {
+ *buf++ = 0xFF; // TLV length
+ *buf++ = record_len >> 8; // ...
+ *buf++ = record_len & 0xFF; // ...
+ }
+
+ // Record header
+ *buf++ = flags; // Flags and TNF
+ *buf++ = type_len; // Type length
+ if(flags & (1 << 4)) { // SR (Short Record)
+ *buf++ = payload_len; // Payload length
+ } else {
+ *buf++ = payload_len >> 24 & 0xFF; // Payload length
+ *buf++ = payload_len >> 16 & 0xFF; // ...
+ *buf++ = payload_len >> 8 & 0xFF; // ...
+ *buf++ = payload_len & 0xFF; // ...
+ }
+ memcpy(buf, type, type_len); // Payload type
+ buf += type_len;
+
+ // Record payload
+ memcpy(buf, payload, payload_len);
+ buf += payload_len;
+ free(payload);
+
+ // Record terminator
+ *buf++ = 0xFE;
+
+ return buf - app->ndef_buffer; // Size of NDEF data
+}
+
+void nfc_maker_scene_save_generate_submenu_callback(void* context, uint32_t index) {
+ NfcMaker* app = context;
+ view_dispatcher_send_custom_event(app->view_dispatcher, index);
+}
+
+void nfc_maker_scene_save_generate_on_enter(void* context) {
+ NfcMaker* app = context;
+ Submenu* submenu = app->submenu;
+ size_t ndef_size = nfc_maker_scene_save_generate_populate_ndef_buffer(app);
+
+ submenu_set_header(submenu, "Tag Type:");
+
+ for(Ntag ntag = 0; ntag < NtagMAX; ntag++) {
+ submenu_add_lockable_item(
+ submenu,
+ ntag_names[ntag],
+ ntag,
+ nfc_maker_scene_save_generate_submenu_callback,
+ app,
+ ndef_size > ntag_sizes[ntag],
+ "Data is\ntoo large!");
+ }
+
+ submenu_set_selected_item(
+ submenu, scene_manager_get_scene_state(app->scene_manager, NfcMakerSceneSaveGenerate));
+
+ view_dispatcher_switch_to_view(app->view_dispatcher, NfcMakerViewSubmenu);
+}
+
+bool nfc_maker_scene_save_generate_on_event(void* context, SceneManagerEvent event) {
+ NfcMaker* app = context;
+ bool consumed = false;
+
+ if(event.type == SceneManagerEventTypeCustom) {
+ scene_manager_set_scene_state(app->scene_manager, NfcMakerSceneSaveGenerate, event.event);
+ if(event.event >= NtagMAX) return consumed;
+ consumed = true;
+
+ nfc_data_generator_fill_data(ntag_generators[event.event], app->nfc_device);
+ MfUltralightData* data = mf_ultralight_alloc();
+ nfc_device_copy_data(app->nfc_device, NfcProtocolMfUltralight, data);
+
+ size_t size =
+ MIN(ntag_sizes[event.event], // Known size
+ data->page[3].data[2] * NTAG_DATA_AREA_UNIT_SIZE // Capability Container
+ );
+ memcpy(&data->page[4].data[0], app->ndef_buffer, size);
+ nfc_device_set_data(app->nfc_device, NfcProtocolMfUltralight, data);
+ mf_ultralight_free(data);
+
+ scene_manager_next_scene(app->scene_manager, NfcMakerSceneSaveName);
+ }
+
+ return consumed;
+}
+
+void nfc_maker_scene_save_generate_on_exit(void* context) {
+ NfcMaker* app = context;
+ submenu_reset(app->submenu);
+}
diff --git a/base_pack/nfc_maker/scenes/nfc_maker_scene_save.c b/base_pack/nfc_maker/scenes/nfc_maker_scene_save_name.c
similarity index 75%
rename from base_pack/nfc_maker/scenes/nfc_maker_scene_save.c
rename to base_pack/nfc_maker/scenes/nfc_maker_scene_save_name.c
index 00ba9b282a2..5275a35f97b 100644
--- a/base_pack/nfc_maker/scenes/nfc_maker_scene_save.c
+++ b/base_pack/nfc_maker/scenes/nfc_maker_scene_save_name.c
@@ -4,23 +4,23 @@ enum TextInputResult {
TextInputResultOk,
};
-static void nfc_maker_scene_save_text_input_callback(void* context) {
+static void nfc_maker_scene_save_name_text_input_callback(void* context) {
NfcMaker* app = context;
view_dispatcher_send_custom_event(app->view_dispatcher, TextInputResultOk);
}
-void nfc_maker_scene_save_on_enter(void* context) {
+void nfc_maker_scene_save_name_on_enter(void* context) {
NfcMaker* app = context;
NFCMaker_TextInput* text_input = app->text_input;
nfc_maker_text_input_set_header_text(text_input, "Save the NFC tag:");
- name_generator_make_auto(app->save_buf, BIG_INPUT_LEN, "NFC");
+ name_generator_make_auto(app->save_buf, BIG_INPUT_LEN, "NTAG");
nfc_maker_text_input_set_result_callback(
text_input,
- nfc_maker_scene_save_text_input_callback,
+ nfc_maker_scene_save_name_text_input_callback,
app,
app->save_buf,
BIG_INPUT_LEN,
@@ -34,7 +34,7 @@ void nfc_maker_scene_save_on_enter(void* context) {
view_dispatcher_switch_to_view(app->view_dispatcher, NfcMakerViewTextInput);
}
-bool nfc_maker_scene_save_on_event(void* context, SceneManagerEvent event) {
+bool nfc_maker_scene_save_name_on_event(void* context, SceneManagerEvent event) {
NfcMaker* app = context;
bool consumed = false;
@@ -42,7 +42,7 @@ bool nfc_maker_scene_save_on_event(void* context, SceneManagerEvent event) {
consumed = true;
switch(event.event) {
case TextInputResultOk:
- scene_manager_next_scene(app->scene_manager, NfcMakerSceneResult);
+ scene_manager_next_scene(app->scene_manager, NfcMakerSceneSaveResult);
break;
default:
break;
@@ -52,7 +52,7 @@ bool nfc_maker_scene_save_on_event(void* context, SceneManagerEvent event) {
return consumed;
}
-void nfc_maker_scene_save_on_exit(void* context) {
+void nfc_maker_scene_save_name_on_exit(void* context) {
NfcMaker* app = context;
nfc_maker_text_input_reset(app->text_input);
}
diff --git a/base_pack/nfc_maker/scenes/nfc_maker_scene_save_result.c b/base_pack/nfc_maker/scenes/nfc_maker_scene_save_result.c
new file mode 100644
index 00000000000..85b99204fab
--- /dev/null
+++ b/base_pack/nfc_maker/scenes/nfc_maker_scene_save_result.c
@@ -0,0 +1,59 @@
+#include "../nfc_maker.h"
+
+enum PopupEvent {
+ PopupEventExit,
+};
+
+static void nfc_maker_scene_save_result_popup_callback(void* context) {
+ NfcMaker* app = context;
+
+ view_dispatcher_send_custom_event(app->view_dispatcher, PopupEventExit);
+}
+
+void nfc_maker_scene_save_result_on_enter(void* context) {
+ NfcMaker* app = context;
+ Popup* popup = app->popup;
+
+ FuriString* path =
+ furi_string_alloc_printf(NFC_MK_APP_FOLDER "/%s" NFC_MK_APP_EXTENSION, app->save_buf);
+ bool success = nfc_device_save(app->nfc_device, furi_string_get_cstr(path));
+ furi_string_free(path);
+
+ if(success) {
+ popup_set_icon(popup, 36, 5, &I_DolphinDone_80x58);
+ popup_set_header(popup, "Saved!", 13, 22, AlignLeft, AlignBottom);
+ } else {
+ popup_set_icon(popup, 69, 15, &I_WarningDolphinFlip_45x42);
+ popup_set_header(popup, "Error!", 13, 22, AlignLeft, AlignBottom);
+ }
+ popup_set_timeout(popup, 1500);
+ popup_set_context(popup, app);
+ popup_set_callback(popup, nfc_maker_scene_save_result_popup_callback);
+ popup_enable_timeout(popup);
+
+ view_dispatcher_switch_to_view(app->view_dispatcher, NfcMakerViewPopup);
+}
+
+bool nfc_maker_scene_save_result_on_event(void* context, SceneManagerEvent event) {
+ NfcMaker* app = context;
+ bool consumed = false;
+
+ if(event.type == SceneManagerEventTypeCustom) {
+ consumed = true;
+ switch(event.event) {
+ case PopupEventExit:
+ scene_manager_search_and_switch_to_previous_scene(
+ app->scene_manager, NfcMakerSceneStart);
+ break;
+ default:
+ break;
+ }
+ }
+
+ return consumed;
+}
+
+void nfc_maker_scene_save_result_on_exit(void* context) {
+ NfcMaker* app = context;
+ popup_reset(app->popup);
+}
diff --git a/base_pack/nfc_maker/scenes/nfc_maker_scene_text.c b/base_pack/nfc_maker/scenes/nfc_maker_scene_text.c
index 3c1f7d3caeb..e1a3464b5ed 100644
--- a/base_pack/nfc_maker/scenes/nfc_maker_scene_text.c
+++ b/base_pack/nfc_maker/scenes/nfc_maker_scene_text.c
@@ -37,7 +37,7 @@ bool nfc_maker_scene_text_on_event(void* context, SceneManagerEvent event) {
consumed = true;
switch(event.event) {
case TextInputResultOk:
- scene_manager_next_scene(app->scene_manager, NfcMakerSceneSave);
+ scene_manager_next_scene(app->scene_manager, NfcMakerSceneSaveGenerate);
break;
default:
break;
diff --git a/base_pack/nfc_maker/scenes/nfc_maker_scene_url.c b/base_pack/nfc_maker/scenes/nfc_maker_scene_url.c
index 03c620308be..614c343e5e6 100644
--- a/base_pack/nfc_maker/scenes/nfc_maker_scene_url.c
+++ b/base_pack/nfc_maker/scenes/nfc_maker_scene_url.c
@@ -37,7 +37,7 @@ bool nfc_maker_scene_url_on_event(void* context, SceneManagerEvent event) {
consumed = true;
switch(event.event) {
case TextInputResultOk:
- scene_manager_next_scene(app->scene_manager, NfcMakerSceneSave);
+ scene_manager_next_scene(app->scene_manager, NfcMakerSceneSaveGenerate);
break;
default:
break;
diff --git a/base_pack/nfc_maker/scenes/nfc_maker_scene_wifi_auth.c b/base_pack/nfc_maker/scenes/nfc_maker_scene_wifi_auth.c
index 6e14c4e97e5..835500ec192 100644
--- a/base_pack/nfc_maker/scenes/nfc_maker_scene_wifi_auth.c
+++ b/base_pack/nfc_maker/scenes/nfc_maker_scene_wifi_auth.c
@@ -66,7 +66,7 @@ bool nfc_maker_scene_wifi_auth_on_event(void* context, SceneManagerEvent event)
scene_manager_set_scene_state(
app->scene_manager, NfcMakerSceneWifiEncr, WifiEncryptionNone);
strcpy(app->small_buf2, "");
- scene_manager_next_scene(app->scene_manager, NfcMakerSceneSave);
+ scene_manager_next_scene(app->scene_manager, NfcMakerSceneSaveGenerate);
} else {
scene_manager_set_scene_state(
app->scene_manager, NfcMakerSceneWifiEncr, WifiEncryptionAes);
diff --git a/base_pack/nfc_maker/scenes/nfc_maker_scene_wifi_pass.c b/base_pack/nfc_maker/scenes/nfc_maker_scene_wifi_pass.c
index 228cd95da74..db0b510fe9d 100644
--- a/base_pack/nfc_maker/scenes/nfc_maker_scene_wifi_pass.c
+++ b/base_pack/nfc_maker/scenes/nfc_maker_scene_wifi_pass.c
@@ -37,7 +37,7 @@ bool nfc_maker_scene_wifi_pass_on_event(void* context, SceneManagerEvent event)
consumed = true;
switch(event.event) {
case TextInputResultOk:
- scene_manager_next_scene(app->scene_manager, NfcMakerSceneSave);
+ scene_manager_next_scene(app->scene_manager, NfcMakerSceneSaveGenerate);
break;
default:
break;