Force settings reset for 2.04

Also updates FI to #267 but wont be built in releases until string lengths fit.

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ 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.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 <http://www.gnu.org/licenses/>.
+
+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:
+
+    <program>  Copyright (C) <year>  <name of author>
+    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
+<http://www.gnu.org/licenses/>.
+
+  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
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

workspace/TS100/.cproject

@@ -22,7 +22,7 @@
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="fr.ac6.managedbuild.targetPlatform.gnu.cross.317155453" isAbstract="false" osList="all" superClass="fr.ac6.managedbuild.targetPlatform.gnu.cross"/>
 							<builder buildPath="${workspace_loc:/TS100}/Debug" id="fr.ac6.managedbuild.builder.gnu.cross.910934658" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="fr.ac6.managedbuild.builder.gnu.cross"/>
 							<tool id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.319926124" name="MCU GCC Compiler" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler">
-								<option id="fr.ac6.managedbuild.gnu.c.compiler.option.optimization.level.1178790692" name="Optimization Level" superClass="fr.ac6.managedbuild.gnu.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="fr.ac6.managedbuild.gnu.c.optimization.level.debug" valueType="enumerated"/>
+								<option id="fr.ac6.managedbuild.gnu.c.compiler.option.optimization.level.1178790692" name="Optimization Level" superClass="fr.ac6.managedbuild.gnu.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="fr.ac6.managedbuild.gnu.c.optimization.level.size" valueType="enumerated"/>
 								<option id="gnu.c.compiler.option.debugging.level.1214895662" name="Debug Level" superClass="gnu.c.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.max" valueType="enumerated"/>
 								<option id="gnu.c.compiler.option.include.paths.1766485383" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/inc&quot;"/>
@@ -44,11 +44,12 @@
 									<listOptionValue builtIn="false" value="USE_RTOS_SYSTICK"/>
 								</option>
 								<option id="gnu.c.compiler.option.dialect.std.565083189" name="Language standard" superClass="gnu.c.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.c.compiler.dialect.default" valueType="enumerated"/>
+								<option id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.fdata.338139343" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.fdata" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c.176392389" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c"/>
 								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s.893418158" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s"/>
 							</tool>
 							<tool id="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.1941847243" name="MCU G++ Compiler" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler">
-								<option id="fr.ac6.managedbuild.gnu.cpp.compiler.option.optimization.level.1283353237" name="Optimization Level" superClass="fr.ac6.managedbuild.gnu.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="fr.ac6.managedbuild.gnu.cpp.optimization.level.debug" valueType="enumerated"/>
+								<option id="fr.ac6.managedbuild.gnu.cpp.compiler.option.optimization.level.1283353237" name="Optimization Level" superClass="fr.ac6.managedbuild.gnu.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="fr.ac6.managedbuild.gnu.cpp.optimization.level.size" valueType="enumerated"/>
 								<option id="gnu.cpp.compiler.option.debugging.level.224874042" name="Debug Level" superClass="gnu.cpp.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
 								<option id="gnu.cpp.compiler.option.include.paths.1749257477" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/inc&quot;"/>
@@ -70,6 +71,7 @@
 									<listOptionValue builtIn="false" value="USE_RTOS_SYSTICK"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.dialect.std.1681974405" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.cpp.compiler.dialect.default" valueType="enumerated"/>
+								<option id="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.fdata.1463726438" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.fdata" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.cpp.149685854" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.cpp"/>
 								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.s.1092052043" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.s"/>
 							</tool>

workspace/TS100/.settings/language.settings.xml

@@ -6,7 +6,7 @@
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="3703734836139458" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="1750838549288477430" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -18,7 +18,7 @@
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="3703734836139458" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="1750838549288477430" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

workspace/TS100/.vscode/c_cpp_properties.json

@@ -0,0 +1,66 @@
+{
+    "configurations": [
+        {
+            "name": "Mac",
+            "includePath": [
+                "/usr/include",
+                "/usr/local/include",
+                "${workspaceFolder}"
+            ],
+            "defines": ["STM32F103T8Ux","STM32F1","STM32","USE_HAL_DRIVER","STM32F103xB","USE_RTOS_SYSTICK"],
+            "intelliSenseMode": "clang-x64",
+            "browse": {
+                "path": [
+                    "/usr/include",
+                    "/usr/local/include",
+                    "${workspaceFolder}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            },
+            "macFrameworkPath": [
+                "/System/Library/Frameworks",
+                "/Library/Frameworks"
+            ]
+        },
+        {
+            "name": "STM32",
+            "includePath": [
+                "${workspaceFolder}",
+                "/usr/include/c++/5",
+                "/usr/include/x86_64-linux-gnu/c++/5",
+                "/usr/include/c++/5/backward",
+                "/usr/lib/llvm-5.0/lib/clang/5.0.0/include",
+                "/usr/local/include",
+                "/usr/include/x86_64-linux-gnu",
+                "/usr/include",
+                "${workspaceFolder}/inc",
+                "${workspaceFolder}/HAL_Driver/Inc",
+                "${workspaceFolder}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS",
+                "${workspaceFolder}/CMSIS/device",
+                "${workspaceFolder}/Middlewares/Third_Party/FreeRTOS/Source/include",
+                "${workspaceFolder}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3"
+            ],
+            "defines": [],
+            "intelliSenseMode": "clang-x64",
+            "browse": {
+                "path": [
+                    "${workspaceFolder}",
+                    "/usr/include/c++/5",
+                    "/usr/include/x86_64-linux-gnu/c++/5",
+                    "/usr/include/c++/5/backward",
+                    "/usr/lib/llvm-5.0/lib/clang/5.0.0/include",
+                    "/usr/local/include",
+                    "/usr/include/x86_64-linux-gnu",
+                    "/usr/include"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            },
+            "compilerPath": "/usr/bin/clang++-5.0",
+            "cStandard": "c11",
+            "cppStandard": "c++17"
+        }
+    ],
+    "version": 3
+}

workspace/TS100/build.sh

@@ -19,7 +19,19 @@ make -j16 lang=PL
 rm -rf Objects/src
 make -j16 lang=RU
 rm -rf Objects/src
-make -j16 lang=SE
+make -j16 lang=FI
 rm -rf Objects/src
 make -j16 lang=TR
 rm -rf Objects/src
+make -j16 lang=BG
+rm -rf Objects/src
+make -j16 lang=SK
+rm -rf Objects/src
+make -j16 lang=HUN
+rm -rf Objects/src
+make -j16 lang=BR
+rm -rf Objects/src
+make -j16 lang=LT
+rm -rf Objects/src
+make -j16 lang=UK
+rm -rf Objects/src

workspace/TS100/inc/Settings.h

@@ -11,7 +11,7 @@
 #define SETTINGS_H_
 #include <stdint.h>
 #include "stm32f1xx_hal.h"
-#define SETTINGSVERSION 0x12 /*Change this if you change the struct below to prevent people getting out of sync*/
+#define SETTINGSVERSION 0x13 /*Change this if you change the struct below to prevent people getting out of sync*/
 
 /*
  * This struct must be a multiple of 2 bytes as it is saved / restored from flash in uint16_t chunks

workspace/TS100/inc/Translation.h

@@ -39,6 +39,7 @@ extern const char* IdleTipString;
 extern const char* IdleSetString;
 extern const char* TipDisconnectedString;
 extern const char* SolderingAdvancedPowerPrompt;
+extern const char* OffString;
 
 extern const char SettingTrueChar;
 extern const char SettingFalseChar;

workspace/TS100/inc/main.hpp

@@ -7,7 +7,7 @@
 
 extern OLED lcd;
 extern MMA8652FC accel;
-
+extern uint8_t PCBVersion;
 enum ButtonState {
 	BUTTON_NONE = 0, /* No buttons pressed / < filter time*/
 	BUTTON_F_SHORT = 1, /* User has pressed the front button*/

workspace/TS100/src/LIS2DH12.cpp

@@ -33,7 +33,9 @@ void LIS2DH12::initalize() {
 uint8_t LIS2DH12::getOrientation() {
 	// 8=right handed,4=left,16=flat
 	//So we ignore if not 8/4
+	taskENTER_CRITICAL();
 	uint8_t pos = I2C_RegisterRead(LIS_INT2_SRC);
+	taskEXIT_CRITICAL();
 	if (pos == 8)
 		return 1;
 	else if (pos == 4)
@@ -59,7 +61,6 @@ void LIS2DH12::setSensitivity(uint8_t threshold, uint8_t filterTime) {
 }
 
 void LIS2DH12::I2C_RegisterWrite(uint8_t reg, uint8_t data) {
-
 	HAL_I2C_Mem_Write(i2c, LIS2DH_I2C_ADDRESS, reg, I2C_MEMADD_SIZE_8BIT, &data,
 			1, 500);
 }
@@ -68,6 +69,5 @@ uint8_t LIS2DH12::I2C_RegisterRead(uint8_t reg) {
 	uint8_t tx_data[1];
 	HAL_I2C_Mem_Read(i2c, LIS2DH_I2C_ADDRESS, reg, I2C_MEMADD_SIZE_8BIT,
 			tx_data, 1, 500);
-
 	return tx_data[0];
 }

workspace/TS100/src/Settings.cpp

@@ -66,12 +66,12 @@ void restoreSettings() {
  */
 uint8_t lookupVoltageLevel(uint8_t level) {
 	if (level == 0)
-		return 100;    //10V since iron does not function effectively below this
+		return 90;    //9V since iron does not function effectively below this
 	else
 		return (level * 33) + (33 * 2);
 }
 void resetSettings() {
-
+	memset((void*)&systemSettings,0,sizeof(systemSettingsType));
 	systemSettings.SleepTemp = 150;    //Temperature the iron sleeps at - default 150.0 C
 	systemSettings.SleepTime = 6;    //How many seconds/minutes we wait until going to sleep - default 1 min
 	systemSettings.SolderingTemp = 320;    //Default soldering temp is 320.0 C

workspace/TS100/src/Setup.c

@@ -36,7 +36,7 @@ void Setup_HAL() {
 	MX_TIM2_Init();
 	MX_IWDG_Init();
 
-	HAL_ADC_Start_DMA(&hadc1, (uint32_t*) ADCReadings, 64);
+	HAL_ADC_Start_DMA(&hadc1, (uint32_t*) ADCReadings, 64);//start DMA of normal readings
 	HAL_ADCEx_InjectedStart(&hadc1);    //enable injected  readings
 }
 
@@ -170,7 +170,7 @@ static void MX_IWDG_Init(void) {
 
 	hiwdg.Instance = IWDG;
 	hiwdg.Init.Prescaler = IWDG_PRESCALER_256;
-	hiwdg.Init.Reload = 50;
+	hiwdg.Init.Reload = 100;
 	HAL_IWDG_Init(&hiwdg);
 
 }
@@ -252,7 +252,7 @@ static void MX_TIM2_Init(void) {
 	HAL_TIMEx_MasterConfigSynchronization(&htim2, &sMasterConfig);
 
 	sConfigOC.OCMode = TIM_OCMODE_PWM1;
-	sConfigOC.Pulse = 117;
+	sConfigOC.Pulse = 118;
 	/*
 	 * It takes 4 milliseconds for output to be stable after PWM turns off.
 	 * Assume ADC samples in 0.5ms

workspace/TS100/src/Translation.cpp

@@ -93,6 +93,7 @@ const char* IdleTipString = "Tip:";                     // IdleTipString+IdleSet
 const char* IdleSetString = " Set:";                    // preferably start with a space; IdleTipString+IdleSetString <= 10
 const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars
 const char* SolderingAdvancedPowerPrompt = "Power: ";   // <=12 chars
+const char* OffString ="Off";                           // 3 chars max
 
 const char SettingRightChar = 'R';
 const char SettingLeftChar = 'L';
@@ -106,7 +107,7 @@ const char* SettingsShortNames[17][2] = {
   /* (<= 11) Power source (DC or batt)          */ {"Power", "source"},
   /* (<=  9) Sleep temperature                  */ {"Sleep", "temp"},
   /* (<=  9) Sleep timeout                      */ {"Sleep", "timeout"},
-  /* (<= 11) Shutdown timeout                   */ {"Shutdown", "timeout"},
+  /* (<= 10) Shutdown timeout                   */ {"Shutdown", "timeout"},
   /* (<= 13) Motion sensitivity level           */ {"Motion", "sensitivity"},
   /* (<= 13) Temperature in F and C             */ {"Temperature", "units"},
   /* (<= 13) Advanced idle display mode enabled */ {"Detailed", "idle screen"},
@@ -176,6 +177,7 @@ const char* IdleTipString = "Връх:";                       // IdleTipString+
 const char* IdleSetString = " Set:";                       // preferably start with a space; IdleTipString+IdleSetString <= 10
 const char* TipDisconnectedString = "ВРЪХ ЛОША ВРЪЗКА";    // <=16 chars
 const char* SolderingAdvancedPowerPrompt = "Захранване: "; // <=12 chars
+const char* OffString ="Off";                              // 3 chars max
 
 const char SettingRightChar = 'R';
 const char SettingLeftChar = 'L';
@@ -189,7 +191,7 @@ const char* SettingsShortNames[17][2] = {
   /* (<= 11) Power source (DC or batt)          */ {"Източник", "захранване"},
   /* (<=  9) Sleep temperature                  */ {"Темп.", "сън"},
   /* (<=  9) Sleep timeout                      */ {"Време", "сън"},
-  /* (<= 11) Shutdown timeout                   */ {"Време", "изкл."},
+  /* (<= 10) Shutdown timeout                   */ {"Време", "изкл."},
   /* (<= 13) Motion sensitivity level           */ {"Усещане", "за движение"},
   /* (<= 13) Temperature in F and C             */ {"Единици за", "температура"},
   /* (<= 13) Advanced idle display mode enabled */ {"Детайлен", "екран в покой"},
@@ -223,41 +225,42 @@ const char* SettingsMenuEntriesDescriptions[4] = {
 const char* SettingsDescriptions[17] = {
 	// These are all the help text for all the settings.
 	// No requirements on spacing or length.
-	/* Power source (DC or batt)          */ "Источник питания. Установка напряжения отключения. <DC 10V> <S 3.3 V на батарею>",
-	/* Sleep temperature                  */ "Температура режима ожидания <С>",
-	/* Sleep timeout                      */ "Время до перехода в режим ожидания <Минуты>",
-	/* Shutdown timeout                   */ "Время до отключения <Минуты>",
-	/* Motion sensitivity level           */ "Акселерометр <0. Выкл. 1. мин. чувствительный 9. макс. чувствительный>",
-	/* Temperature in F and C             */ "В чем измерять температуру",
-	/* Advanced idle display mode enabled */ "Показывать детальную информацию маленьким шрифтом на домашнем экране",
-	/* Display rotation mode              */ "Ориентация дисплея <A. Автоматический, Л. Левая рука, П. Правая рука>",
+	/* Power source (DC or batt)          */ "Установка напряжения отключения. <DC - 10V, 3S - 9.9V, 4S - 13.2V, 5S - 16.5V, 6S - 19.8V>",
+	/* Sleep temperature                  */ "Температура режима ожидания <C°/F°>",
+	/* Sleep timeout                      */ "Время до перехода в режим ожидания <Доступно отключение>",
+	/* Shutdown timeout                   */ "Время до отключения <Доступно отключение>",
+	/* Motion sensitivity level           */ "Акселерометр <0 - Выкл. 1 - мин. чувствительный 9 - макс. чувствительный>",
+	/* Temperature in F and C             */ "Единица измерения температуры < C - Цельсий, F - Фаренгейт >",
+	/* Advanced idle display mode enabled */ "Показывать детальную в режиме настроек <Вместо картинки>",
+	/* Display rotation mode              */ "Ориентация дисплея <A - Автоповорот, L - Левша, R - Правша>",
 	/* Boost enabled                      */ "Турбо-режим при удержании кнопки А при пайке ",
-	/* Boost temperature                  */ "Температура в турбо-режиме",
-	/* Automatic start mode               */ "Автоматический запуск паяльника при включении питания. T=Нагрев, S=Режим ожидания,F=Выкл.",
-	/* Cooldown blink                     */ "Показывать температуру на экране охлаждения, пока жало остается горячим.",
-	/* Temperature calibration enter menu */ "Калибровка термодатчика.",
-	/* Settings reset command             */ "Сброс всех настроек.",
+	/* Boost temperature                  */ "Температура в Турбо-режиме",
+	/* Automatic start mode               */ "Автоматический переход в режим пайки при включении питания.",
+	/* Cooldown blink                     */ "Показывать температуру на экране охлаждения, пока жало остается горячим, при этом экран моргает",
+	/* Temperature calibration enter menu */ "Калибровка температурного датчика.",
+	/* Settings reset command             */ "Сброс всех настроек к исходным значения.",
 	/* Calibrate input voltage            */ "Калибровка напряжения входа. Настройка кнопками, нажать и удержать чтобы завершить.",
 	/* Advanced soldering screen enabled  */ "Показывать детальную информацию при пайке.",
-	/* Description Scroll Speed           */ "Speed this text scrolls past at",
+	/* Description Scroll Speed           */ "Скорость прокрутки текста",
 };
 
 const char* SettingsCalibrationWarning = "Убедитесь, что жало остыло до комнатной температуры, прежде чем продолжать!";
-const char* SettingsResetWarning = "Are you sure to reset settings to default values?";
-const char* UVLOWarningString = "БАТ РАЗР";              // <=8 chars
-const char* UndervoltageString = "Undervoltage";         // <=16 chars
-const char* InputVoltageString = "Input V: ";            // <=11 chars, preferably end with a space
-const char* WarningTipTempString = "Tip Temp: ";         // <=12 chars, preferably end with a space
-const char* BadTipString = "BAD TIP";                    // <=8 chars
-const char* SleepingSimpleString = "Хррр";               // Must be <= 4 chars
+const char* SettingsResetWarning = "Вы действительно хотите сбросить настройки до значений по умолчанию?";
+const char* UVLOWarningString = "АККУМ--";               // <=8 chars
+const char* UndervoltageString = "Под питанием";         // <=16 chars
+const char* InputVoltageString = "Питание(B):";          // <=11 chars, preferably end with a space
+const char* WarningTipTempString = "Жало t°: ";          // <=12 chars, preferably end with a space
+const char* BadTipString = "Жало--";                     // <=8 chars
+const char* SleepingSimpleString = "Сон ";                // Must be <= 4 chars
 const char* SleepingAdvancedString = "Ожидание...";      // <=16 chars
 const char* WarningSimpleString = " АЙ!";                // Must be <= 4 chars
-const char* WarningAdvancedString = "ОСТОРОЖНО! ГОРЯЧО"; // <=16 chars
-cconst char* SleepingTipAdvancedString = "Tip:";         // <=6 chars
-const char* IdleTipString = "Tip:";                      // IdleTipString+IdleSetString <= 10
-const char* IdleSetString = " Set:";                     // preferably start with a space; IdleTipString+IdleSetString <= 10
-const char* TipDisconnectedString = "TIP DISCONNECTED";  // <=16 chars
-const char* SolderingAdvancedPowerPrompt = "Power: ";    // <=12 chars
+const char* WarningAdvancedString = "ВНИМАНИЕ ГОРЯЧО!"; // <=16 chars
+const char* SleepingTipAdvancedString = "Жало:";         // <=6 chars
+const char* IdleTipString = "Жало:";                     // IdleTipString+IdleSetString <= 10
+const char* IdleSetString = " ->";                  // preferably start with a space; IdleTipString+IdleSetString <= 10
+const char* TipDisconnectedString = "Жало отключено!";   // <=16 chars
+const char* SolderingAdvancedPowerPrompt = "Питание: ";  // <=12 chars
+const char* OffString ="Off";                            // 3 chars max
 
 /*
  * #TODO change support for multibyte constants here
@@ -269,40 +272,40 @@ const char SettingRightChar = 'R';
 const char SettingLeftChar = 'L';
 const char SettingAutoChar = 'A';
 
-const char SettingFastChar = 'F';
-const char SettingSlowChar = 'S';
+const char SettingFastChar = '+';
+const char SettingSlowChar = '-';
 
-const enum ShortNameType SettingsShortNameType = SHORT_NAME_SINGLE_LINE;
+const enum ShortNameType SettingsShortNameType = SHORT_NAME_DOUBLE_LINE;
 const char* SettingsShortNames[17][2] = {
-  /* (<= 5) Power source (DC or batt)          */ {"ИстП  "},
-  /* (<= 4) Sleep temperature                  */ {"Тожд"},
-  /* (<= 4) Sleep timeout                      */ {"Вожд "},
-  /* (<= 5) Shutdown timeout                   */ {"Тоткл "},
-  /* (<= 6) Motion sensitivity level           */ {"ЧувсДв "},
-  /* (<= 6) Temperature in F and C             */ {"ЕдТемп "},
-  /* (<= 6) Advanced idle display mode enabled */ {"ИнфОжд "},
-  /* (<= 6) Display rotation mode              */ {"ПовЭкр "},
-  /* (<= 6) Boost enabled                      */ {"Турбо  "},
-  /* (<= 4) Boost temperature                  */ {"Ттур "},
-  /* (<= 6) Automatic start mode               */ {"Астарт"},
-  /* (<= 6) Cooldown blink                     */ {"Охлажд "},
-  /* (<= 8) Temperature calibration enter menu */ {"КалибрТ"},
-  /* (<= 8) Settings reset command             */ {"СБРОС?"},
-  /* (<= 8) Calibrate input voltage            */ {"КалибрU?"},
-  /* (<= 6) Advanced soldering screen enabled  */ {"ИнфПай "},
-  /* (<= 6) Message Scroll Speed               */ {"DESCSP"},
+  /* (<= 11) Power source (DC or batt)          */ {"Источник","питания"},		//8,7
+  /* (<=  9) Sleep temperature                  */ {"Темпер.","сна"},			//7,3
+  /* (<=  9) Sleep timeout                      */ {"Таймаут","сна"},			//7,3
+  /* (<= 10) Shutdown timeout                   */ {"Время до","отключения"},		//8,10
+  /* (<= 13) Motion sensitivity level           */ {"Чувст. сенсо-","ра движения"},	//13,11
+  /* (<= 13) Temperature in F and C             */ {"Формат темпе-","ратуры(C°/F°)"},	//13,13
+  /* (<= 13) Advanced idle display mode enabled */ {"Подробный ре-","жим ожидания"},	//13,12
+  /* (<= 13) Display rotation mode              */ {"Автоповорот","экрана"},		//11,6
+  /* (<= 13) Boost enabled                      */ {"Режим","Турбо"},			//5,5
+  /* (<=  9) Boost temperature                  */ {"Темпер.","Турбо"},                 //7,5
+  /* (<= 13) Automatic start mode               */ {"Горячий","старт"},			//9,9
+  /* (<= 13) Cooldown blink                     */ {"Показ t° при","остывании"},	//7,3
+  /* (<= 16) Temperature calibration enter menu */ {"Калибровка","температуры"},	//10,11
+  /* (<= 16) Settings reset command             */ {"Сбросить все","настройки?"},	//12,10
+  /* (<= 16) Calibrate input voltage            */ {"Калибровка","напряжения"},		//10,10
+  /* (<= 13) Advanced soldering screen enabled  */ {"Подробный ре-","жим пайки"},	//13,9
+  /* (<= 11) Message Scroll Speed               */ {"Скорость","текста"},		//8,6
 };
 
 const char* SettingsMenuEntries[4] = {
-/*Soldering Menu*/"Soldering\nSettings",
-/* Power Saving Menu*/"Sleep\nModes",
-/* UI Menu*/"User\nInterface",
-/* Advanced Menu*/"Advanced\nOptions", };
+/*Soldering Menu*/"Пайка",
+/* Power Saving Menu*/"Сон",
+/* UI Menu*/"Интерфейс",
+/* Advanced Menu*/"Другие", };
 const char* SettingsMenuEntriesDescriptions[4] ={
-"Soldering settings",
-"Power Saving Settings",
-"User Interface settings",
-"Advanced options"
+"Настройки для режима пайки. Действуют при включенном жале.",
+"Настройки при бездействии. Полезно что бы не обжечься и случайно не сжечь жилище.",
+"Пользовательский интерфейс.",
+"Расширенные настройки. Дополнительные удобства."
 };
 #endif
 
@@ -316,21 +319,21 @@ const char* SettingsDescriptions[17] = {
   /* Shutdown timeout                   */ "Tiempo hasta apagado. <Minutos>",
   /* Motion sensitivity level           */ "Sensibilidad del movimiento. <0=Apagado 1=El menos sensible 9=El más sensible>",
   /* Temperature in F and C             */ "Unidad de temperatura.",
-  /* Advanced idle display mode enabled */ "Display detailed information in a smaller font on the idle screen.",
+  /* Advanced idle display mode enabled */ "Mostrar información detallada con fuente de menor tamaño en la pantalla de reposo.",
   /* Display rotation mode              */ "Orientación de la pantalla <A=Automático I=Mano izquierda D=Mano derecha>",
   /* Boost enabled                      */ "Activar el botón \"Boost\" en modo soldadura.",
   /* Boost temperature                  */ "Temperatura en modo \"Boost\". <C>",
   /* Automatic start mode               */ "Iniciar modo soldadura en el encendido. <V=Sí S=Modo reposo F=No>",
   /* Cooldown blink                     */ "Parpadea la temperatura en el enfriamiento si la punta sigue caliente.",
-  /* Temperature calibration enter menu */ "Calibrate tip offset.",
-  /* Settings reset command             */ "Reset all settings",
-  /* Calibrate input voltage            */ "VIN Calibration. Buttons adjust, long press to exit",
-  /* Advanced soldering screen enabled  */ "Display detailed information while soldering",
-  /* Description Scroll Speed           */ "Speed this text scrolls past at",
+  /* Temperature calibration enter menu */ "Calibrar desviación térmica de la punta.",
+  /* Settings reset command             */ "Volver a estado de fábrica.",
+  /* Calibrate input voltage            */ "Calibración VIN (Voltaje de entrada). Ajuste con ambos botones, pulsación larga para salir.",
+  /* Advanced soldering screen enabled  */ "Mostrar información detallada mientras suelda.",
+  /* Description Scroll Speed           */ "Velocidad de desplazamiento del texto.",
 };
 
-const char* SettingsCalibrationWarning = "Please ensure the tip is at room temperature before continuing!";
-const char* SettingsResetWarning = "Are you sure to reset settings to default values?";
+const char* SettingsCalibrationWarning = "Por favor, ¡asegúrese que la punta esté a temperatura ambiente antes de proceder!";
+const char* SettingsResetWarning = "¿Está seguro de volver a estado de fábrica?";
 const char* UVLOWarningString = "DC LOW";                // <=8 chars
 const char* UndervoltageString = "Undervoltage";         // <=16 chars
 const char* InputVoltageString = "Input V: ";            // <=11 chars, preferably end with a space
@@ -345,13 +348,14 @@ const char* IdleTipString = "Tip:";                      // IdleTipString+IdleSe
 const char* IdleSetString = " Set:";                     // preferably start with a space; IdleTipString+IdleSetString <= 10
 const char* TipDisconnectedString = "TIP DISCONNECTED";  // <=16 chars
 const char* SolderingAdvancedPowerPrompt = "Power: ";    // <=12 chars
+const char* OffString ="Off";                            // 3 chars max
 
-const char SettingRightChar = 'R';
-const char SettingLeftChar = 'L';
+const char SettingRightChar = 'D'; // D is "Derecha" = Right
+const char SettingLeftChar = 'I'; // I is "Izquierda" = Left
 const char SettingAutoChar = 'A';
 
-const char SettingFastChar = 'F';
-const char SettingSlowChar = 'S';
+const char SettingFastChar = 'R'; // R is "Rápido" = Fast
+const char SettingSlowChar = 'L'; // L is "Lento" = Slow
 
 const enum ShortNameType SettingsShortNameType = SHORT_NAME_SINGLE_LINE;
 const char* SettingsShortNames[17][2] = {
@@ -374,95 +378,101 @@ const char* SettingsShortNames[17][2] = {
   /* (<= 6) Message Scroll Speed               */ {"DESCSP"},
 };
 const char* SettingsMenuEntries[4] = {
-/*Soldering Menu*/"Soldering\nSettings",
-/* Power Saving Menu*/"Sleep\nModes",
-/* UI Menu*/"User\nInterface",
-/* Advanced Menu*/"Advanced\nOptions", };
+/*Soldering Menu*/"Opciones de\nsoldadura",
+/* Power Saving Menu*/"Modos de\nreposo",
+/* UI Menu*/"Interfaz de\nusuario",
+/* Advanced Menu*/"Opciones\navanzadas", };
 const char* SettingsMenuEntriesDescriptions[4] ={
-"Soldering settings",
-"Power Saving Settings",
-"User Interface settings",
-"Advanced options"
+"Opciones de soldadura",
+"Opciones de ahorro energético",
+"Opciones de interfaz de usuario",
+"Opciones avanzadas"
 };
 #endif
 
-#ifdef LANG_SE
+#ifdef LANG_FI
+
 const char* SettingsDescriptions[17] = {
-	// These are all the help text for all the settings.
-	// No requirements on spacing or length.
-	/* Power source (DC or batt)          */ "Источник питания. Установка напряжения отключения. <DC 10V> <S 3.3 V на батарею>",
-	/* Sleep temperature                  */ "Температура Сна  <С>",
-	/* Sleep timeout                      */ "Переход в режим Сна <Минуты>",
-	/* Shutdown timeout                   */ "Переходит в режим ожидания <Минуты>",
-	/* Motion sensitivity level           */ "Акселерометр <0. Выкл. 1. мин. чувствительный 9. макс. чувствительный>",
-	/* Temperature in F and C             */ "В чем измерять температуру",
-	/* Advanced idle display mode enabled */ "Display detailed information in a smaller font on the idle screen.",
-	/* Display rotation mode              */ "Ориентация Дисплея <A. Автоматический L. Левая Рука R. Правая Рука>",
-	/* Boost enabled                      */ "Активация  кнопки A для Турбо режима до  450С при пайке ",
-	/* Boost temperature                  */ "Установка температуры для Турбо режима",
-	/* Automatic start mode               */ "Автоматический запуск паяльника при включении питания. T=Нагрев, S= Режим Сна,F=Выкл.",
-	/* Cooldown blink                     */ "Мигает температура на экране охлаждения, пока жало остается горячим.",
-	/* Temperature calibration enter menu */ "Calibrate tip offset.",
-	/* Settings reset command             */ "Reset all settings",
-	/* Calibrate input voltage            */ "VIN Calibration. Buttons adjust, long press to exit",
-	/* Advanced soldering screen enabled  */ "Display detailed information while soldering",
-	/* Description Scroll Speed           */ "Speed this text scrolls past at",
+  // These are all the help text for all the settings.
+  // No requirements on spacing or length.
+  /* Power source (DC or batt)          */ "Käytettävä virtalähde. Asettaa katkaisujänniteen. <DC 10V, 3S=9.9V, 4S=13.2V, 5S=16.5V, 6S=19.8V>",
+  /* Sleep temperature                  */ "Lepotilan lämpötila <C>", //"Lepolämpötila <C>",
+  /* Sleep timeout                      */ "Lepotilan viive <minuuttia/sekuntia>",//"Lepoviive <minuuttia/sekuntia>",
+  /* Shutdown timeout                   */ "Sammutuksen aikaviive <minuuttia>",
+  /* Motion sensitivity level           */ "Liikkeentunnistuksen herkkyys <0=pois, 1=epäherkin, 9=herkin>", //"Liikeherkkyys <0=pois, 1=epäherkin, 9=herkin>",
+  /* Temperature in F and C             */ "Lämpötilan yksikkö <C=celsius, F=fahrenheit>",
+  /* Advanced idle display mode enabled */ "Näytä yksityiskohtaiset tiedot lepotilassa", //"Näyttää tarkemmat tiedot leponäytössä",
+  /* Display rotation mode              */ "Näytön kierto <A=automaattinen O=oikeakätinen V=vasenkätinen>", //"Näytön suunta <A=automaattinen O=oikeakätinen V=vasenkätinen>",
+  /* Boost enabled                      */ "Etupainikeella siirrytään juotettaessa tehostustilaan ",
+  /* Boost temperature                  */ "Tehostustilan lämpötila", //"Tehostuksen lämpötila kun käytetään tehostustilaa",
+  /* Automatic start mode               */ "Aloittaa lämmityksen automaattisesti kun virrat kytketään. T=juotostila, S=Lepotila, F=Ei käytössä", //"Lämmitys käynnistyy automaattisesti kun virrat kytketään. T=juottamiseen, S=lepotilaan, F=ei käytössä",
+  /* Cooldown blink                     */ "Vilkutetaan näytössä lämpötilaa kun juotoskärki jäähtyy, mutta on yhä kuuma",
+  /* Temperature calibration enter menu */ "Kalibroi kärjen lämpötilaero", //"Kalibroidaan juotoskärjen lämpötilaero",
+  /* Settings reset command             */ "Palauta kaikki asetukset oletusarvoihin" //"Palautetaan kaikki asetukset alkuperäisiksi",
+  /* Calibrate input voltage            */ "Tulojännitten kalibrointi (VIN). Painikkeilla säädetään ja pitkään painamalla poistutaan",
+  /* Advanced soldering screen enabled  */ "Näytä yksityiskohtaiset tiedot juotostilassa", //"Näytetään tarkemmat tiedot juottamisen aikana",
+  /* Description Scroll Speed           */ "Näiden ohjetekstien vieritysnopeus" ,//"Tekstin vieritysnopeus näytöllä",
 };
 
-const char* SettingsCalibrationWarning = "Please ensure the tip is at room temperature before continuing!";
-const char* SettingsResetWarning = "Are you sure to reset settings to default values?";
-const char* UVLOWarningString = "DC LOW";                // <=8 chars
-const char* UndervoltageString = "Undervoltage";         // <=16 chars
-const char* InputVoltageString = "Input V: ";            // <=11 chars, preferably end with a space
-const char* WarningTipTempString = "Tip Temp: ";         // <=12 chars, preferably end with a space
-const char* BadTipString = "BAD TIP";                    // <=8 chars
-const char* SleepingSimpleString = "Zzzz";               // Must be <= 4 chars
-const char* SleepingAdvancedString = "Sleeping...";      // <=16 chars
-const char* WarningSimpleString = "HOT!";                // Must be <= 4 chars
-const char* WarningAdvancedString = "WARNING! TIP HOT!"; // <=16 chars
-const char* SleepingTipAdvancedString = "Tip:";          // <=6 chars
-const char* IdleTipString = "Tip:";                      // IdleTipString+IdleSetString <= 10
-const char* IdleSetString = " Set:";                     // preferably start with a space; IdleTipString+IdleSetString <= 10
-const char* TipDisconnectedString = "TIP DISCONNECTED";  // <=16 chars
-const char* SolderingAdvancedPowerPrompt = "Power: ";    // <=12 chars
+const char* SettingsCalibrationWarning = "Varmista että kärki on huoneenlämpöinen ennen jatkamista!"; //"Älä jatka ennen kuin kärki on jäähtynyt!";
+const char* SettingsResetWarning = "Haluatko varmasti palauttaa oletusarvot?"; //"Haluatko palauttaa oletusarvot?";
+const char* UVLOWarningString = "DC LOW";               // <=8 chars
+const char* UndervoltageString = "Alijännite";        // <=16 chars
+const char* InputVoltageString = "Jännite: ";           // <=11 chars, preferably end with a space
+const char* WarningTipTempString = "Lämpötila: ";        // <=12 chars, preferably end with a space
+const char* BadTipString = "VIKATILA";                   // <=8 chars
+const char* SleepingSimpleString = "Zzz";              // Must be <= 4 chars
+const char* SleepingAdvancedString = "Lepotila...";     // <=16 chars
+const char* WarningSimpleString = "HOT";               // Must be <= 4 chars
+const char* WarningAdvancedString = " ! KÄRKI KUUMA !"; //"KUUMA KÄRKI";  // <=16 chars
+const char* SleepingTipAdvancedString = "Kärki:";         // <=6 chars
+const char* IdleTipString = "Kärki:";                     // IdleTipString+IdleSetString <= 10
+const char* IdleSetString = " Asetus:";                    // preferably start with a space; IdleTipString+IdleSetString <= 10
+const char* TipDisconnectedString = "KÄRKI ON IRTI"; // <=16 chars
+const char* SolderingAdvancedPowerPrompt = "Teho: ";   // <=12 chars
+const char* OffString ="OFF";                           // 3 chars max
 
-const char SettingRightChar = 'R';
-const char SettingLeftChar = 'L';
+const char SettingRightChar = 'O';
+const char SettingLeftChar = 'V';
 const char SettingAutoChar = 'A';
 
-const char SettingFastChar = 'F';
-const char SettingSlowChar = 'S';
+const char SettingFastChar = 'N';   //'F';
+const char SettingSlowChar = 'H';   //'S';
 
-const enum ShortNameType SettingsShortNameType = SHORT_NAME_SINGLE_LINE;
+const enum ShortNameType SettingsShortNameType = SHORT_NAME_DOUBLE_LINE;
 const char* SettingsShortNames[17][2] = {
-  /* (<= 5) Power source (DC or batt)          */ {"PWRSC"},
-  /* (<= 4) Sleep temperature                  */ {"STMP"},
-  /* (<= 4) Sleep timeout                      */ {"STME"},
-  /* (<= 5) Shutdown timeout                   */ {"SHTME"},
-  /* (<= 6) Motion sensitivity level           */ {"MSENSE"},
-  /* (<= 6) Temperature in F and C             */ {"TMPUNT"},
-  /* (<= 6) Advanced idle display mode enabled */ {"ADVIDL"},
-  /* (<= 6) Display rotation mode              */ {"DSPROT"},
-  /* (<= 6) Boost enabled                      */ {"BOOST"},
-  /* (<= 4) Boost temperature                  */ {"BTMP"},
-  /* (<= 6) Automatic start mode               */ {"ASTART"},
-  /* (<= 6) Cooldown blink                     */ {"CLBLNK"},
-  /* (<= 8) Temperature calibration enter menu */ {"TMP CAL?"},
-  /* (<= 8) Settings reset command             */ {"RESET?"},
-  /* (<= 8) Calibrate input voltage            */ {"CAL VIN?"},
-  /* (<= 6) Advanced soldering screen enabled  */ {"ADVSLD"},
-  /* (<= 6) Message Scroll Speed               */ {"DESCSP"},
+  /* (<= 11) Power source (DC or batt)          */ {"Virtalähde", "DC"},
+  /* (<=  9) Sleep temperature                  */ {"Lepotilan", "lämpötila"},
+  /* (<=  9) Sleep timeout                      */ {"Lepotilan", "viive"},
+  /* (<= 10) Shutdown timeout                   */ {"Sammutuksen", "viive"}, // Too long
+  /* (<= 13) Motion sensitivity level           */ {"Liikkeen", "herkkyys"},
+  /* (<= 13) Temperature in F and C             */ {"Lämpötilan", "yksikkö"},
+  /* (<= 13) Advanced idle display mode enabled */ {"Tarkemmat tiedot", "lepotilassa"}, // Too long
+  /* (<= 13) Display rotation mode              */ {"Näytön", "esityssuunta"},
+  /* (<= 13) Boost enabled                      */ {"Tehostus", "käytössä"},
+  /* (<=  9) Boost temperature                  */ {"Tehostus", "lämpötila"},
+  /* (<= 13) Automatic start mode               */ {"Automattinen", "käynnistyminen"}, // Too long
+  /* (<= 13) Cooldown blink                     */ {"Jäähdytyksen", "vilkutus"},
+  /* (<= 16) Temperature calibration enter menu */ {"Kalibroidaanko", "lämpötila?"},
+  /* (<= 16) Settings reset command             */ {"Palautetaanko", "tehdasasetukset?"},
+  /* (<= 16) Calibrate input voltage            */ {"Kalibroidaanko", "tulojännite?"},
+  /* (<= 13) Advanced soldering screen enabled  */ {"Monipuolisempi", "juotosnäyttö"}, // Too long
+  /* (<= 11) Display Help Text Scroll Speed     */ {"Selitteiden","näyttönopeus"}, // Too long
 };
+
+// SettingsMenuEntries lengths <= 13 per line (\n starts second line)
 const char* SettingsMenuEntries[4] = {
-/*Soldering Menu*/"Soldering\nSettings",
-/* Power Saving Menu*/"Sleep\nModes",
-/* UI Menu*/"User\nInterface",
-/* Advanced Menu*/"Advanced\nOptions", };
-const char* SettingsMenuEntriesDescriptions[4] ={
-"Soldering settings",
-"Power Saving Settings",
-"User Interface settings",
-"Advanced options"
+  /* Soldering Menu    */ "Juotos-\nasetukset" ,//"Juotos\nasetukset",
+  /* Power Saving Menu */ "Lepotilan\nasetukset", // "Lepo\ntila",
+  /* UI Menu           */ "Käyttö-\nliittymä", //"Käyttö\nliittymä",
+  /* Advanced Menu     */ "Lisäasetukset", // "Lisä\nasetukset",
+};
+
+const char* SettingsMenuEntriesDescriptions[4] = {
+  "Juotosasetukset",
+  "Virransäästöasetukset",
+  "Käyttöliittymän asetukset",
+  "Lisäasetukset"
 };
 #endif
 
@@ -471,15 +481,15 @@ const char* SettingsDescriptions[17] = {
   // These are all the help text for all the settings.
   // No requirements on spacing or length.
   /* Power source (DC or batt)          */"Scegli la sorgente di alimentazione; se a batteria, limita lo scaricamento al valore di soglia <DC: 10V; S: 3.3V per cella>",
-  /* Sleep temperature                  */"Imposta la temperatura da mantenere in modalità standby <°C>",
-  /* Sleep timeout                      */"Imposta il timer per entrare in modalità standby <minuti/secondi>",
+  /* Sleep temperature                  */"Imposta la temperatura da mantenere in modalità Standby <°C/°F>",
+  /* Sleep timeout                      */"Imposta il timer per entrare in modalità Standby <minuti/secondi>",
   /* Shutdown timeout                   */"Imposta il timer per lo spegnimento <minuti>",
-  /* Motion sensitivity level           */"Imposta la sensibilità al movimento per uscire dalla modalità standby <0: nessuna; 1: minima; 9: massima>",
+  /* Motion sensitivity level           */"Imposta la sensibilità al movimento per uscire dalla modalità Standby <0: nessuna; 1: minima; 9: massima>",
   /* Temperature in F and C             */"Scegli l'unità di misura per la temperatura <C: grado Celsius; F: grado Farenheit>",
   /* Advanced idle display mode enabled */"Mostra informazioni dettagliate con un carattere più piccolo all'interno della schermata principale",
   /* Display rotation mode              */"Imposta l'orientamento del display <A: automatico; S: mano sinistra; D: mano destra>",
-  /* Boost enabled                      */"Il tasto superiore attiva la funzione \"turbo\" durante la modalità Saldatura",
-  /* Boost temperature                  */"Imposta la temperatura della funzione \"turbo\"",
+  /* Boost enabled                      */"Il tasto superiore attiva la funzione «Turbo» durante la modalità Saldatura",
+  /* Boost temperature                  */"Imposta la temperatura della funzione «Turbo»",
   /* Automatic start mode               */"Attiva automaticamente il saldatore quando viene alimentato <A: saldatura; S: standby; D: disattiva>",
   /* Cooldown blink                     */"Mostra la temperatura durante il raffreddamento se la punta è ancora calda",
   /* Temperature calibration enter menu */"Calibra le rilevazioni di temperatura",
@@ -495,7 +505,7 @@ const char* SettingsResetWarning = "Ripristinare le impostazioni iniziali?";
 const char* UVLOWarningString = "DC BASSA";            // <=8 chars
 const char* UndervoltageString = "DC INSUFFICIENTE";   // <=16 chars
 const char* InputVoltageString = "V ingresso:";        // <=11 chars, preferably end with a space
-const char* WarningTipTempString = "Temp punta:";      // <=12 chars, preferably end with a space
+const char* WarningTipTempString = "Punta:";           // <=12 chars, preferably end with a space
 const char* BadTipString = "PUNTA NO";                 // <=8 chars
 const char* SleepingSimpleString = "ZZZ ";             // Must be <= 4 chars
 const char* SleepingAdvancedString = "Standby";        // <=16 chars
@@ -506,6 +516,7 @@ const char* IdleTipString = "Punta:";                  // IdleTipString+IdleSetS
 const char* IdleSetString = "/";                       // preferably start with a space; IdleTipString+IdleSetString <= 10
 const char* TipDisconnectedString = "PUNTA ASSENTE";   // <=16 chars
 const char* SolderingAdvancedPowerPrompt = "Potenza:"; // <=12 chars
+const char* OffString ="OFF";                          // 3 chars max
 
 const char SettingRightChar = 'D';
 const char SettingLeftChar = 'S';
@@ -519,13 +530,13 @@ const enum ShortNameType SettingsShortNameType = SHORT_NAME_DOUBLE_LINE;
     /* (<= 11) Power source (DC or batt)          */ {"Sorgente", "alimentaz"},
     /* (<=  9) Sleep temperature                  */ {"Temp", "standby"},
     /* (<=  9) Sleep timeout                      */ {"Timer", "standby"},
-    /* (<= 11) Shutdown timeout                   */ {"Timer", "spegnimento"},
+    /* (<= 10) Shutdown timeout                   */ {"Timer di", "arresto"},
     /* (<= 13) Motion sensitivity level           */ {"Sensibilità", "al movimento"},
     /* (<= 13) Temperature in F and C             */ {"Unità di", "temperatura"},
     /* (<= 13) Advanced idle display mode enabled */ {"Mostra", "dettagli"},
     /* (<= 13) Display rotation mode              */ {"Orientamento", "display"},
-    /* (<= 13) Boost enabled                      */ {"Funzione", "\"turbo\""},
-    /* (<=  9) Boost temperature                  */ {"Temp", "\"turbo\""},
+    /* (<= 13) Boost enabled                      */ {"Funzione", "«Turbo»"},
+    /* (<=  9) Boost temperature                  */ {"Temp", "«Turbo»"},
     /* (<= 13) Automatic start mode               */ {"Avvio", "automatico"},
     /* (<= 13) Cooldown blink                     */ {"Avviso", "punta calda"},
     /* (<= 16) Temperature calibration enter menu */ {"Calibrazione", "temperatura"},
@@ -587,6 +598,7 @@ const char* IdleTipString = "PANNE:";                     // IdleTipString+IdleS
 const char* IdleSetString = " Set:";                      // preferably start with a space; IdleTipString+IdleSetString <= 10
 const char* TipDisconnectedString = "PANNE DEBRANCH";     // <=16 chars
 const char* SolderingAdvancedPowerPrompt = "Puissance: "; // <= 12 chars
+const char* OffString ="Off";                             // 3 chars max
 
 const char SettingRightChar = 'D';
 const char SettingLeftChar = 'G';
@@ -600,7 +612,7 @@ const char* SettingsShortNames[17][2] = {
   /* (<= 11) Power source (DC or batt)          */ {"Source", "d'alim"},
   /* (<=  9) Sleep temperature                  */ {"Temp.", "veille"},
   /* (<=  9) Sleep timeout                      */ {"Délai", "veille"},
-  /* (<= 11) Shutdown timeout                   */ {"Délai", "extinction"},
+  /* (<= 10) Shutdown timeout                   */ {"Délai", "extinction"},
   /* (<= 13) Motion sensitivity level           */ {"Sensibilité", "au mouvement"},
   /* (<= 13) Temperature in F and C             */ {"Unité de", "température"},
   /* (<= 13) Advanced idle display mode enabled */ {"Ecran veille", "détaillé"},
@@ -668,6 +680,7 @@ const char* IdleTipString = "Ist:";                      // IdleTipString+IdleSe
 const char* IdleSetString = " Soll:";                    // preferably start with a space; IdleTipString+IdleSetString <= 10
 const char* TipDisconnectedString = "Spitze fehlt";      // <=16 chars
 const char* SolderingAdvancedPowerPrompt = "Leistung: "; // <= 12 chars
+const char* OffString ="Off";                            // 3 chars max
 
 const char SettingRightChar = 'R';
 const char SettingLeftChar = 'L';
@@ -681,7 +694,7 @@ const char* SettingsShortNames[17][2] = {
   /* (<= 11) Power source (DC or batt)          */ {"Spannungs-", "quelle"},
   /* (<=  9) Sleep temperature                  */ {"Ruhetemp-", "eratur"},
   /* (<=  9) Sleep timeout                      */ {"Ruhever-", "zögerung"},
-  /* (<= 11) Shutdown timeout                   */ {"Abschalt-", "zeit"},
+  /* (<= 10) Shutdown timeout                   */ {"Abschalt-", "zeit"},
   /* (<= 13) Motion sensitivity level           */ {"Bewegungs-", "empfindlichk."},
   /* (<= 13) Temperature in F and C             */ {"Temperatur-", "einheit"},
   /* (<= 13) Advanced idle display mode enabled */ {"Detaillierte", "Ruheansicht"},
@@ -748,6 +761,7 @@ const char* IdleTipString = "Tip:";                      // IdleTipString+IdleSe
 const char* IdleSetString = " Set:";                     // preferably start with a space; IdleTipString+IdleSetString <= 10
 const char* TipDisconnectedString = "TIP DISCONNECTED";  // <=16 chars
 const char* SolderingAdvancedPowerPrompt = "Power: ";    // <=12 chars
+const char* OffString ="Off";                            // 3 chars max
 
 const char SettingRightChar = 'R';
 const char SettingLeftChar = 'L';
@@ -828,6 +842,7 @@ const char* IdleTipString = "Tip:";                     // IdleTipString+IdleSet
 const char* IdleSetString = " Set:";                    // preferably start with a space; IdleTipString+IdleSetString <= 10
 const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars
 const char* SolderingAdvancedPowerPrompt = "Power: ";   // <=12 chars
+const char* OffString ="Off";                           // 3 chars max
 
 const char SettingRightChar = 'R';
 const char SettingLeftChar = 'L';
@@ -908,6 +923,7 @@ const char* IdleTipString = "Vrh: ";                    // IdleTipString+IdleSet
 const char* IdleSetString = " / ";                      // preferably start with a space; IdleTipString+IdleSetString <= 10
 const char* TipDisconnectedString = "VRH NIJE SPOJEN!"; // <=16 chars
 const char* SolderingAdvancedPowerPrompt = "Snaga: ";   // <=12 chars
+const char* OffString ="Off";                           // 3 chars max
 
 const char SettingRightChar = 'D';
 const char SettingLeftChar = 'L';
@@ -921,7 +937,7 @@ const char* SettingsShortNames[17][2] = {
   /* (<= 11) Power source (DC or batt)          */ {"Izvor", "napajanja"},
   /* (<=  9) Sleep temperature                  */ {"Temp", "spavanja"},
   /* (<=  9) Sleep timeout                      */ {"Vrijeme", "spavanja"},
-  /* (<= 11) Shutdown timeout                   */ {"Vrijeme", "gašenja"},
+  /* (<= 10) Shutdown timeout                   */ {"Vrijeme", "gašenja"},
   /* (<= 13) Motion sensitivity level           */ {"Osjetljivost", "pokreta"},
   /* (<= 13) Temperature in F and C             */ {"Jedinica", "temperature"},
   /* (<= 13) Advanced idle display mode enabled */ {"Detalji", "pri čekanju"},
@@ -986,6 +1002,7 @@ const char* IdleTipString = "Hrot:";                    // IdleTipString+IdleSet
 const char* IdleSetString = " Cíl:";                    // preferably start with a space; IdleTipString+IdleSetString <= 10
 const char* TipDisconnectedString = "HROT NEPŘIPOJEN";  // <=16 chars
 const char* SolderingAdvancedPowerPrompt = "Ohřev: ";   // <=12 chars
+const char* OffString ="Off";                           // 3 chars max
 
 const char SettingRightChar = 'P';
 const char SettingLeftChar = 'L';
@@ -999,7 +1016,7 @@ const char* SettingsShortNames[17][2] = {
   /* (<= 11) Power source (DC or batt)          */ {"Zdroj", "napájení"},
   /* (<=  9) Sleep temperature                  */ {"Teplota v", "r. spánku"},
   /* (<=  9) Sleep timeout                      */ {"Čas do", "r. spánku"},
-  /* (<= 11) Shutdown timeout                   */ {"Čas do", "vypnutí"},
+  /* (<= 10) Shutdown timeout                   */ {"Čas do", "vypnutí"},
   /* (<= 13) Motion sensitivity level           */ {"Citlivost", "det. pohybu"},
   /* (<= 13) Temperature in F and C             */ {"Jednotky", "teploty"},
   /* (<= 13) Advanced idle display mode enabled */ {"Podrobnosti", "na vých. obr."},
@@ -1070,6 +1087,7 @@ const char* IdleTipString = "Tip:";                     // IdleTipString+IdleSet
 const char* IdleSetString = " Set:";                    // preferably start with a space; IdleTipString+IdleSetString <= 10
 const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars
 const char* SolderingAdvancedPowerPrompt = "Power: ";   // <=12 chars
+const char* OffString ="Off";                           // 3 chars max
 
 const char SettingRightChar = 'R';
 const char SettingLeftChar = 'L';
@@ -1150,6 +1168,7 @@ const char* IdleTipString = "Tip:";                     // IdleTipString+IdleSet
 const char* IdleSetString = " Set:";                    // preferably start with a space; IdleTipString+IdleSetString <= 10
 const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars
 const char* SolderingAdvancedPowerPrompt = "Power: ";   // <=12 chars
+const char* OffString ="Off";                           // 3 chars max
 
 const char SettingRightChar = 'H';
 const char SettingLeftChar = 'V';
@@ -1230,6 +1249,7 @@ const char* IdleTipString = "Tip:";                     // IdleTipString+IdleSet
 const char* IdleSetString = " Set:";                    // preferably start with a space; IdleTipString+IdleSetString <= 10
 const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars
 const char* SolderingAdvancedPowerPrompt = "Power: ";   // <=12 chars
+const char* OffString ="Off";                           // 3 chars max
 
 const char SettingRightChar = 'P';
 const char SettingLeftChar = 'L';
@@ -1310,6 +1330,7 @@ const char* IdleTipString = "Ponta:";                 // IdleTipString+IdleSetSt
 const char* IdleSetString = " Aj:";                   // preferably start with a space; IdleTipString+IdleSetString <= 10
 const char* TipDisconnectedString = "SEM PONTA";      // <=16 chars
 const char* SolderingAdvancedPowerPrompt = "Power: "; // <=12 chars
+const char* OffString ="Off";                         // 3 chars max
 
 const char SettingRightChar = 'D';
 const char SettingLeftChar  = 'C';
@@ -1390,6 +1411,7 @@ const char* IdleTipString = "Ant:";                        // IdleTipString+Idle
 const char* IdleSetString = " Nust:";                      // preferably start with a space; IdleTipString+IdleSetString <= 10
 const char* TipDisconnectedString = "ANTGAL ATJUNGTAS";    // <=16 chars
 const char* SolderingAdvancedPowerPrompt = "Maitinimas: "; // <=12 chars
+const char* OffString ="Off";                              // 3 chars max
 
 const char SettingRightChar = 'D';
 const char SettingLeftChar = 'K';
@@ -1403,7 +1425,7 @@ const char* SettingsShortNames[17][2] = {
   /* (<= 11) Power source (DC or batt)          */ {"Maitinimo", "šaltinis"},
   /* (<=  9) Sleep temperature                  */ {"Miego", "temperat."},
   /* (<=  9) Sleep timeout                      */ {"Miego", "laikas"},
-  /* (<= 11) Shutdown timeout                   */ {"Išjungimo", "laikas"},
+  /* (<= 10) Shutdown timeout                   */ {"Išjungimo", "laikas"},
   /* (<= 13) Motion sensitivity level           */ {"Jautrumas", "judesiui"},
   /* (<= 13) Temperature in F and C             */ {"Temperatūros", "vienetai"},
   /* (<= 13) Advanced idle display mode enabled */ {"Detalus lauki-", "mo ekranas"},
@@ -1431,3 +1453,87 @@ const char* SettingsMenuEntriesDescriptions[4] ={
 "Išplėstiniai nustatymai"
 };
 #endif
+
+#ifdef LANG_UK
+const char* SettingsDescriptions[17] = {
+	// These are all the help text for all the settings.
+	// No requirements on spacing or length.
+	/* Power source (DC or batt)          */ "Установка напруги відключення. <DC - 10V, 3S - 9.9V, 4S - 13.2V, 5S - 16.5V, 6S - 19.8V>",
+	/* Sleep temperature                  */ "Температура режиму очікування <C°/F°>",
+	/* Sleep timeout                      */ "Час до переходу в режим очікування <Доступно отключение>",
+	/* Shutdown timeout                   */ "Час до відключення <Доступно відключення>",
+	/* Motion sensitivity level           */ "Акселерометр <0 - Викл. 1 хв. чутливості 9 - макс. чутливості>",
+	/* Temperature in F and C             */ "Одиниця виміру температури <C - Цельсій, F - Фаренгейт>",
+	/* Advanced idle display mode enabled */ "Показувати детальну в режимі налаштувань <Замість картинки>",
+	/* Display rotation mode              */ "Орієнтація дисплея <A - Автоповорот, L - Лівша, R - Правша>",
+	/* Boost enabled                      */ "Турбо-режим при утриманні кнопки А при пайці",
+	/* Boost temperature                  */ "Температура в Турбо-режимі",
+	/* Automatic start mode               */ "Автоматичний перехід в режим пайки при включенні живлення.",
+	/* Cooldown blink                     */ "Показувати температуру на екрані охолодження, поки жало залишається гарячим, при цьому екран моргає",
+	/* Temperature calibration enter menu */ "Калібрування температурного датчика.",
+	/* Settings reset command             */ "Скидання всіх параметрів до вихідних значень.",
+	/* Calibrate input voltage            */ "Калібрування напруги входу. Налаштувати кнопками, натиснути і утримати щоб завершити.",
+	/* Advanced soldering screen enabled  */ "Показувати детальну інформацію при пайці.",
+	/* Description Scroll Speed           */ "Швидкість прокрутки тексту",
+};
+
+const char* SettingsCalibrationWarning = "Переконайтеся, що жало охололо до кімнатної температури, перш ніж продовжувати!";
+const char* SettingsResetWarning = "Ви дійсно хочете скинути налаштування до значень за замовчуванням?";
+const char* UVLOWarningString = "АККУМ--";              // <=8 chars
+const char* UndervoltageString = "Під живленням";       // <=16 chars
+const char* InputVoltageString = "Жив.(B):";		// <=11 chars, preferably end with a space
+const char* WarningTipTempString = "Жало t°: ";         // <=12 chars, preferably end with a space
+const char* BadTipString = "Жало--";                    // <=8 chars
+const char* SleepingSimpleString = "Сон ";              // Must be <= 4 chars
+const char* SleepingAdvancedString = "Очікування...";   // <=16 chars
+const char* WarningSimpleString = " АЙ!";               // Must be <= 4 chars
+const char* WarningAdvancedString = "УВАГА ГАРЯЧЕ!"; 	// <=16 chars
+const char* SleepingTipAdvancedString = "Жало:";        // <=6 chars
+const char* IdleTipString = "Жало:";                    // IdleTipString+IdleSetString <= 10
+const char* IdleSetString = " ->";                  	// preferably start with a space; IdleTipString+IdleSetString <= 10
+const char* TipDisconnectedString = "Жало вимкнено!";   // <=16 chars
+const char* SolderingAdvancedPowerPrompt = "Живлення: ";// <=12 chars
+const char* OffString ="Вим";                           // 3 chars max
+
+const char SettingRightChar = 'R';
+const char SettingLeftChar = 'L';
+const char SettingAutoChar = 'A';
+
+const char SettingFastChar = '+';
+const char SettingSlowChar = '-';
+
+const enum ShortNameType SettingsShortNameType = SHORT_NAME_DOUBLE_LINE;
+const char* SettingsShortNames[17][2] = {
+  /* (<= 11) Power source (DC or batt)          */ {"Джерело","живлення"},		//7,8
+  /* (<=  9) Sleep temperature                  */ {"Темпер.","сну"},			//7,3
+  /* (<=  9) Sleep timeout                      */ {"Таймаут","сну"},			//7,3
+  /* (<= 10) Shutdown timeout                   */ {"Часу до","вимкнення"},		//7,9
+  /* (<= 13) Motion sensitivity level           */ {"Чутл. сенсо-","ру руху"},		//12,7
+  /* (<= 13) Temperature in F and C             */ {"Формат темпе-","ратури(C°/F°)"},	//13,13
+  /* (<= 13) Advanced idle display mode enabled */ {"Детальний ре-","жим очікуван."},	//13,13
+  /* (<= 13) Display rotation mode              */ {"Автоповорот","екрану"},		//11,6
+  /* (<= 13) Boost enabled                      */ {"Режим","Турбо"},			//5,5
+  /* (<=  9) Boost temperature                  */ {"Темпер.","Турбо"},                 //7,5
+  /* (<= 13) Automatic start mode               */ {"Гарячий","старт"},			//7,5
+  /* (<= 13) Cooldown blink                     */ {"Показ t° при","охолодж."},		//12,8
+  /* (<= 16) Temperature calibration enter menu */ {"Калібровка","температури"},	//10,11
+  /* (<= 16) Settings reset command             */ {"Скинути всі","налаштування?"},	//11,13
+  /* (<= 16) Calibrate input voltage            */ {"Калібровка","напруга"},		//10,7
+  /* (<= 13) Advanced soldering screen enabled  */ {"Детальний ре-","жим пайки"},	//13,9
+  /* (<= 11) Message Scroll Speed               */ {"Швидкість","тексту"},		//9,6
+};
+
+const char* SettingsMenuEntries[4] = {
+/*Soldering Menu*/"Пайка",
+/* Power Saving Menu*/"Сон",
+/* UI Menu*/"Інтерфейс",
+/* Advanced Menu*/"Інші",
+};
+
+const char* SettingsMenuEntriesDescriptions[4] ={
+"Налаштування для режиму пайки. Діють при включеному жалі.",
+"Налаштування при бездіяльності. Корисно що б не обпектися і з часом не спалити житло.",
+"Користувальницький інтерфейс.",
+"Розширені налаштування. Додаткові зручності."
+};
+#endif

workspace/TS100/src/gui.cpp

@@ -228,15 +228,11 @@ static int userConfirmation(const char* message) {
 	int16_t lastOffset = -1;
 	bool lcdRefresh = true;
 
-
 	for (;;) {
 
-					int16_t messageOffset =
-							((xTaskGetTickCount() - messageStart)
-									/ (systemSettings.descriptionScrollSpeed == 1 ?
-											1 : 2));
-					messageOffset %= messageWidth;		//Roll around at the end
-
+		int16_t messageOffset = ((xTaskGetTickCount() - messageStart)
+				/ (systemSettings.descriptionScrollSpeed == 1 ? 1 : 2));
+		messageOffset %= messageWidth;		//Roll around at the end
 
 		if (lastOffset != messageOffset) {
 			lcd.clearScreen();
@@ -289,9 +285,16 @@ static void settings_displayInputVRange(void) {
 }
 
 static void settings_setSleepTemp(void) {
-	systemSettings.SleepTemp += 10;
-	if (systemSettings.SleepTemp > 300)
-		systemSettings.SleepTemp = 50;
+	//If in C, 10 deg, if in F 20 deg
+	if (systemSettings.temperatureInF) {
+		systemSettings.SleepTemp += 20;
+		if (systemSettings.SleepTemp > 580)
+			systemSettings.SleepTemp = 120;
+	} else {
+		systemSettings.SleepTemp += 10;
+		if (systemSettings.SleepTemp > 300)
+			systemSettings.SleepTemp = 50;
+	}
 }
 
 static void settings_displaySleepTemp(void) {
@@ -302,15 +305,18 @@ static void settings_displaySleepTemp(void) {
 static void settings_setSleepTime(void) {
 	systemSettings.SleepTime++;  // Go up 1 minute at a time
 	if (systemSettings.SleepTime >= 16) {
-		systemSettings.SleepTime = 1;  // can't set time over 10 mins
+		systemSettings.SleepTime = 0;  // can't set time over 10 mins
 	}
 	// Remember that ^ is the time of no movement
+	if (PCBVersion == 3)
+		systemSettings.SleepTime = 0;  //Disable sleep on no accel
 }
 
 static void settings_displaySleepTime(void) {
 	printShortDescription(2, 5);
-
-	if (systemSettings.SleepTime < 6) {
+	if (systemSettings.SleepTime == 0) {
+		lcd.print(OffString);
+	} else if (systemSettings.SleepTime < 6) {
 		lcd.printNumber(systemSettings.SleepTime * 10, 2);
 		lcd.drawChar('S');
 	} else {
@@ -324,15 +330,46 @@ static void settings_setShutdownTime(void) {
 	if (systemSettings.ShutdownTime > 60) {
 		systemSettings.ShutdownTime = 0;  // wrap to off
 	}
+	if (PCBVersion == 3)
+		systemSettings.ShutdownTime = 0;  //Disable shutdown on no accel
 }
 
 static void settings_displayShutdownTime(void) {
-	printShortDescription(3, 6);
-	lcd.printNumber(systemSettings.ShutdownTime, 2);
+	printShortDescription(3, 5);
+	if (systemSettings.ShutdownTime == 0) {
+		lcd.print(OffString);
+	} else {
+		lcd.printNumber(systemSettings.ShutdownTime, 2);
+		lcd.drawChar('M');
+	}
 }
 
 static void settings_setTempF(void) {
 	systemSettings.temperatureInF = !systemSettings.temperatureInF;
+	if (systemSettings.temperatureInF) {
+		//Change sleep, boost and soldering temps to the F equiv
+		//C to F == F= ( (C*9) +160)/5
+		systemSettings.BoostTemp = ((systemSettings.BoostTemp * 9) + 160) / 5;
+		systemSettings.SolderingTemp =
+				((systemSettings.SolderingTemp * 9) + 160) / 5;
+		systemSettings.SleepTemp = ((systemSettings.SleepTemp * 9) + 160) / 5;
+	} else {
+		//Change sleep, boost and soldering temps to the C equiv
+		// F->C == C = ((F-32)*5)/9
+		systemSettings.BoostTemp = ((systemSettings.BoostTemp - 32) * 5) / 9;
+		systemSettings.SolderingTemp = ((systemSettings.SolderingTemp - 32) * 5)
+				/ 9;
+		systemSettings.SleepTemp = ((systemSettings.SleepTemp - 32) * 5) / 9;
+
+	}
+	// Rescale both to be multiples of 10
+	systemSettings.BoostTemp = systemSettings.BoostTemp/10;
+	systemSettings.BoostTemp *=10;
+	systemSettings.SolderingTemp = systemSettings.SolderingTemp/10;
+	systemSettings.SolderingTemp *=10;
+	systemSettings.SleepTemp = systemSettings.SleepTemp/10;
+	systemSettings.SleepTemp *=10;
+	
 }
 
 static void settings_displayTempF(void) {
@@ -388,18 +425,18 @@ static void settings_setDisplayRotation(void) {
 	systemSettings.OrientationMode++;
 	systemSettings.OrientationMode = systemSettings.OrientationMode % 3;
 	switch (systemSettings.OrientationMode) {
-		case 0:
-			lcd.setRotation(false);
-			break;
-		case 1:
-			lcd.setRotation(true);
-			break;
-		case 2:
-			//do nothing on auto
-			break;
-		default:
-			break;
-		}
+	case 0:
+		lcd.setRotation(false);
+		break;
+	case 1:
+		lcd.setRotation(true);
+		break;
+	case 2:
+		//do nothing on auto
+		break;
+	default:
+		break;
+	}
 }
 
 static void settings_displayDisplayRotation(void) {
@@ -432,12 +469,14 @@ static void settings_displayBoostModeEnabled(void) {
 }
 
 static void settings_setBoostTemp(void) {
-	systemSettings.BoostTemp += 10;  // Go up 10 at a time
+
 	if (systemSettings.temperatureInF) {
+		systemSettings.BoostTemp += 20;  // Go up 20F at a time
 		if (systemSettings.BoostTemp > 850) {
 			systemSettings.BoostTemp = 480;  // loop back at 250
 		}
 	} else {
+		systemSettings.BoostTemp += 10;  // Go up 10C at a time
 		if (systemSettings.BoostTemp > 450) {
 			systemSettings.BoostTemp = 250;  // loop back at 250
 		}
@@ -719,7 +758,8 @@ void gui_Menu(const menuitem* menu) {
 
 		if ((PRESS_ACCEL_INTERVAL_MAX - autoRepeatAcceleration)
 				< PRESS_ACCEL_INTERVAL_MIN) {
-			autoRepeatAcceleration = PRESS_ACCEL_INTERVAL_MAX - PRESS_ACCEL_INTERVAL_MIN;
+			autoRepeatAcceleration = PRESS_ACCEL_INTERVAL_MAX
+					- PRESS_ACCEL_INTERVAL_MIN;
 		}
 
 		if (lcdRefresh) {

workspace/TS100/src/hardware.c

@@ -62,7 +62,7 @@ uint16_t getTipInstantTemperature() {
 uint16_t getTipRawTemp(uint8_t instant) {
 #define  filterDepth1 1
 	/*Pre filter used before PID*/
-#define  filterDepth2 32
+#define  filterDepth2 48
 	/*Post filter used for UI display*/
 	static uint16_t filterLayer1[filterDepth1];
 	static uint16_t filterLayer2[filterDepth2];

workspace/TS100/src/main.cpp

@@ -47,6 +47,7 @@ int main(void) {
 	lcd.setFont(0);     // default to bigger font
 	//Testing for new weird board version
 	uint8_t buffer[1];
+	HAL_IWDG_Refresh(&hiwdg);
 	if (HAL_I2C_Mem_Read(&hi2c1, 29 << 1, 0x0F, I2C_MEMADD_SIZE_8BIT, buffer, 1,
 			1000) == HAL_OK) {
 		PCBVersion = 1;
@@ -59,6 +60,9 @@ int main(void) {
 		accel2.initalize();						   //startup the accelerometer
 	} else {
 		PCBVersion = 3;
+		systemSettings.SleepTime = 0;
+		systemSettings.ShutdownTime = 0;			//No accel -> disable sleep
+		systemSettings.sensitivity=0;
 	}
 	HAL_IWDG_Refresh(&hiwdg);
 	restoreSettings();  // load the settings from flash
@@ -67,25 +71,25 @@ int main(void) {
 
 	/* Create the thread(s) */
 	/* definition and creation of GUITask */
-	osThreadDef(GUITask, startGUITask, osPriorityBelowNormal, 0, 512);
+	osThreadDef(GUITask, startGUITask, osPriorityBelowNormal, 0, 768);  //3k
 	GUITaskHandle = osThreadCreate(osThread(GUITask), NULL);
 
 	/* definition and creation of PIDTask */
-	osThreadDef(PIDTask, startPIDTask, osPriorityRealtime, 0, 256);
+	osThreadDef(PIDTask, startPIDTask, osPriorityRealtime, 0, 512);  //2k
 	PIDTaskHandle = osThreadCreate(osThread(PIDTask), NULL);
-
-	/* definition and creation of ROTTask */
-	osThreadDef(ROTTask, startRotationTask, osPriorityLow, 0, 256);
-	ROTTaskHandle = osThreadCreate(osThread(ROTTask), NULL);
-	/* definition and creation of MOVTask */
-	osThreadDef(MOVTask, startMOVTask, osPriorityNormal, 0, 256);
-	MOVTaskHandle = osThreadCreate(osThread(MOVTask), NULL);
-
+	if (PCBVersion != 3) {
+		/* definition and creation of ROTTask */
+		osThreadDef(ROTTask, startRotationTask, osPriorityLow, 0, 256);  //1k
+		ROTTaskHandle = osThreadCreate(osThread(ROTTask), NULL);
+		/* definition and creation of MOVTask */
+		osThreadDef(MOVTask, startMOVTask, osPriorityNormal, 0, 512);  //2k
+		MOVTaskHandle = osThreadCreate(osThread(MOVTask), NULL);
+	}
 	/* Create the objects*/
-	rotationChangedSemaphore =
-	xSemaphoreCreateBinary();  // Used to unlock rotation thread
-	accelDataAvailableSemaphore =
-	xSemaphoreCreateBinary();  // Used to unlock the movement thread
+	rotationChangedSemaphore = xSemaphoreCreateBinary();
+	// Used to unlock rotation thread
+	accelDataAvailableSemaphore = xSemaphoreCreateBinary();
+	// Used to unlock the movement thread
 	/* Start scheduler */
 	osKernelStart();
 
@@ -624,7 +628,7 @@ static void gui_solderingMode() {
 		}
 
 		lcd.refresh();
-		if (systemSettings.sensitivity)
+		if (systemSettings.sensitivity && systemSettings.SleepTime)
 			if (xTaskGetTickCount() - lastMovementTime > sleepThres
 					&& xTaskGetTickCount() - lastButtonTime > sleepThres) {
 				if (gui_SolderingSleepingMode()) {
@@ -725,8 +729,8 @@ void startGUITask(void const *argument) {
 			lcd.clearScreen();    // Ensure the buffer starts clean
 			lcd.setCursor(0, 0);  // Position the cursor at the 0,0 (top left)
 			lcd.setFont(1);       // small font
-			lcd.print((char *) "V2.03 PCB");  // Print version number
-			lcd.printNumber(PCBVersion, 1);
+			lcd.print((char *) "V2.04 PCB");  // Print version number
+			lcd.printNumber(PCBVersion, 1); //Print PCB ID number
 			lcd.setCursor(0, 8);         // second line
 			lcd.print(__DATE__);         // print the compile date
 			lcd.refresh();
@@ -755,19 +759,24 @@ void startGUITask(void const *argument) {
 		default:
 			break;
 		}
+
 		currentlyActiveTemperatureTarget = 0;  // ensure tip is off
-		uint16_t tipTemp = tipMeasurementToC(getTipRawTemp(0));
+
+		uint16_t tipTemp = tipMeasurementToC(getTipRawTemp(1));//This forces a faster update rate on the filtering
+
 		if (tipTemp < 50) {
+
 			if (systemSettings.sensitivity) {
+
 				if ((xTaskGetTickCount() - lastMovementTime) > 6000
-						&& (xTaskGetTickCount() - lastButtonTime) > 6000)
+						&& (xTaskGetTickCount() - lastButtonTime) > 6000) {
 					lcd.displayOnOff(false);  // turn lcd off when no movement
-				else
+				} else
 					lcd.displayOnOff(true);  // turn lcd on
 			} else
-				lcd.displayOnOff(true);  // turn lcd on
+				lcd.displayOnOff(true);  // turn lcd on - disabled motion sleep
 		} else
-			lcd.displayOnOff(true);  // turn lcd on
+			lcd.displayOnOff(true);  // turn lcd on when temp > 50C
 
 		if (tipTemp > 600)
 			tipTemp = 0;
@@ -838,16 +847,23 @@ void startPIDTask(void const *argument) {
 	 * struct
 	 *
 	 */
+	setTipPWM(0); // disable the output driver if the output is set to be off
+	osDelay(500);
 	int32_t integralCount = 0;
 	int32_t derivativeLastValue = 0;
 	int32_t kp, ki, kd;
-	kp = 30;
+	kp = 40;
 	ki = 60;
 	kd = 20;
 	// REMEBER ^^^^ These constants are backwards
 	// They act as dividers, so to 'increase' a P term, you make the number
 	// smaller.
-	const int32_t itermMax = 60;
+	if(getInputVoltageX10(systemSettings.voltageDiv) < 150)
+	{
+		//Boot P term if < 15 Volts
+		kp=30;
+	}
+	const int32_t itermMax = 100;
 	for (;;) {
 		uint16_t rawTemp = getTipRawTemp(1);  // get instantaneous reading
 		if (currentlyActiveTemperatureTarget) {
@@ -856,6 +872,11 @@ void startPIDTask(void const *argument) {
 			// 33 counts per C)
 			// P I & D are divisors, so inverse logic applies (beware)
 
+			// Cap the max set point to 450C
+			if (currentlyActiveTemperatureTarget > ctoTipMeasurement(450)) {
+				currentlyActiveTemperatureTarget = ctoTipMeasurement(450);
+			}
+
 			int32_t rawTempError = currentlyActiveTemperatureTarget - rawTemp;
 			int32_t ierror = (rawTempError / ki);
 			integralCount += ierror;
@@ -879,9 +900,9 @@ void startPIDTask(void const *argument) {
 				output = 0;
 			}
 
-			/*if (currentlyActiveTemperatureTarget < rawTemp) {
-			 output = 0;
-			 }*/
+			if (currentlyActiveTemperatureTarget < rawTemp) {
+				output = 0;
+			}
 			setTipPWM(output);
 			derivativeLastValue = rawTemp;  // store for next loop
 
@@ -889,6 +910,7 @@ void startPIDTask(void const *argument) {
 			setTipPWM(0); // disable the output driver if the output is set to be off
 			integralCount = 0;
 			derivativeLastValue = 0;
+			osDelay(100); //sleep for a bit longer
 		}
 
 		HAL_IWDG_Refresh(&hiwdg);
@@ -898,7 +920,7 @@ void startPIDTask(void const *argument) {
 #define MOVFilter 8
 void startMOVTask(void const *argument) {
 	osDelay(4000);  // wait for accel to stabilize
-
+	lastMovementTime = 0;
 	int16_t datax[MOVFilter];
 	int16_t datay[MOVFilter];
 	int16_t dataz[MOVFilter];
@@ -919,8 +941,8 @@ void startMOVTask(void const *argument) {
 			osDelay(5000);
 	}
 	for (;;) {
-		int32_t threshold = 1200 + (9 * 200);
-		threshold -= systemSettings.sensitivity * 200;  // 200 is the step size
+		int32_t threshold = 1500 + (9 * 200);
+		threshold -= systemSettings.sensitivity * 200; // 200 is the step size
 		if (PCBVersion == 2)
 			accel2.getAxisReadings(&tx, &ty, &tz);
 		else if (PCBVersion == 1)
@@ -958,27 +980,24 @@ void startMOVTask(void const *argument) {
 		if (HAL_GPIO_ReadPin(KEY_A_GPIO_Port, KEY_A_Pin) == GPIO_PIN_RESET)
 		max = 0;
 #endif
-		// Only run the actual processing if the sensitivity is set (aka we are
-		// enabled)
-		if (systemSettings.sensitivity) {
-			// calculate averages
-			avgx = avgy = avgz = 0;
-			for (uint8_t i = 0; i < MOVFilter; i++) {
-				avgx += datax[i];
-				avgy += datay[i];
-				avgz += dataz[i];
-			}
-			avgx /= MOVFilter;
-			avgy /= MOVFilter;
-			avgz /= MOVFilter;
 
-			// So now we have averages, we want to look if these are different by more
-			// than the threshold
-			int32_t error = (abs(avgx - tx) + abs(avgy - ty) + abs(avgz - tz));
-			// If error has occured then we update the tick timer
-			if (error > threshold) {
-				lastMovementTime = xTaskGetTickCount();
-			}
+		// calculate averages
+		avgx = avgy = avgz = 0;
+		for (uint8_t i = 0; i < MOVFilter; i++) {
+			avgx += datax[i];
+			avgy += datay[i];
+			avgz += dataz[i];
+		}
+		avgx /= MOVFilter;
+		avgy /= MOVFilter;
+		avgz /= MOVFilter;
+
+		// So now we have averages, we want to look if these are different by more
+		// than the threshold
+		int32_t error = (abs(avgx - tx) + abs(avgy - ty) + abs(avgz - tz));
+		// If error has occurred then we update the tick timer
+		if (error > threshold) {
+			lastMovementTime = xTaskGetTickCount();
 		}
 
 		osDelay(100);  // Slow down update rate

workspace/TS100/src/stm32f1xx_hal_msp.c

@@ -28,8 +28,8 @@ void HAL_MspInit(void) {
 
 	/**NOJTAG: JTAG-DP Disabled and SW-DP Enabled
 	 */
-//	__HAL_AFIO_REMAP_SWJ_NOJTAG()
-	__HAL_AFIO_REMAP_SWJ_DISABLE(); /*Disable swd for debug io use*/
+	__HAL_AFIO_REMAP_SWJ_NOJTAG();
+//	__HAL_AFIO_REMAP_SWJ_DISABLE(); /*Disable swd for debug io use*/
 
 
 }

workspace/TS100/src/stm32f1xx_it.c

@@ -12,35 +12,27 @@ extern TIM_HandleTypeDef htim1; //used for the systick
 /******************************************************************************/
 
 void NMI_Handler(void) {
-
+	NVIC_SystemReset();
 }
 
 //We have the assembly for a breakpoint trigger here to halt the system when a debugger is connected
 // Hardfault handler, often a screwup in the code
 void HardFault_Handler(void) {
-	while (1) {
-		asm("bkpt");
-	}
+	NVIC_SystemReset();
 }
 
 // Memory management unit had an error
 void MemManage_Handler(void) {
-	while (1) {
-		asm("bkpt");
-	}
+	NVIC_SystemReset();
 }
 
 // Prefetcher or busfault occured
 void BusFault_Handler(void) {
-	while (1) {
-		asm("bkpt");
-	}
+	NVIC_SystemReset();
 }
 
 void UsageFault_Handler(void) {
-	while (1) {
-		asm("bkpt");
-	}
+	NVIC_SystemReset();
 }
 
 void DebugMon_Handler(void) {