Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-24 16:55:15 +03:00
Code Activity

Merge with latest 2.3

Browse source
This commit is contained in:
Bertrand Songis 2019-11-07 15:04:45 +01:00
commit 071116afeb
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
286 changed files with 9956 additions and 10363 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,4 +1,3 @@
/.idea/
/.*project /.*project
/.settings /.settings
/.autotools /.autotools

6
.gitmodules vendored
View file

@ -1,4 +1,8 @@
[submodule "libopenui"] [submodule "libopenui"]
path = radio/src/thirdparty/libopenui path = radio/src/thirdparty/libopenui
url = ../libopenui.git url = https://github.com/opentx/libopenui.git
branch = master
[submodule "libACCESS"]
path = radio/src/thirdparty/libACCESS
url = https://github.com/FrSky-OS/libACCESS.git
branch = master branch = master

5
.idea/.gitignore generated vendored Normal file
View file

@ -0,0 +1,5 @@
*.iml
misc.xml
modules.xml
vcs.xml
workspace.xml

1
.idea/.name generated Normal file
View file

@ -0,0 +1 @@
OpenTX

57
.idea/codeStyleSettings.xml generated Normal file
View file

@ -0,0 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectCodeStyleSettingsManager">
<option name="PER_PROJECT_SETTINGS">
<value>
<Objective-C>
<option name="INDENT_VISIBILITY_KEYWORDS" value="2" />
<option name="FUNCTION_BRACE_PLACEMENT" value="2" />
<option name="SUPERCLASS_LIST_BEFORE_COLON" value="0" />
</Objective-C>
<Objective-C-extensions>
<file>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
</file>
<class>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
</class>
<extensions>
<pair source="cpp" header="h" />
<pair source="c" header="h" />
</extensions>
</Objective-C-extensions>
<codeStyleSettings language="CMake">
<option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
<option name="SPACE_BEFORE_WHILE_PARENTHESES" value="false" />
<option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="8" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="ObjectiveC">
<option name="CLASS_BRACE_STYLE" value="2" />
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="8" />
</indentOptions>
</codeStyleSettings>
</value>
</option>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</component>
</project>

31
.idea/codeStyles/Project.xml generated Normal file
View file

@ -0,0 +1,31 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<option name="RIGHT_MARGIN" value="160" />
<Objective-C>
<option name="INDENT_C_STRUCT_MEMBERS" value="2" />
<option name="INDENT_VISIBILITY_KEYWORDS" value="2" />
<option name="FUNCTION_BRACE_PLACEMENT" value="2" />
<option name="SUPERCLASS_LIST_BEFORE_COLON" value="0" />
<option name="SPACE_AFTER_POINTER_IN_DECLARATION" value="true" />
</Objective-C>
<codeStyleSettings language="CMake">
<option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
<option name="SPACE_BEFORE_WHILE_PARENTHESES" value="false" />
<option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="8" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="ObjectiveC">
<option name="CLASS_BRACE_STYLE" value="2" />
<option name="ELSE_ON_NEW_LINE" value="true" />
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="8" />
</indentOptions>
</codeStyleSettings>
</code_scheme>
</component>

6
.idea/codeStyles/codeStyleConfig.xml generated Normal file
View file

@ -0,0 +1,6 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
</state>
</component>

6
.idea/encodings.xml generated Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/companion/targets/windows/license.txt" charset="ISO-8859-1" />
</component>
</project>

2
.travis.yml
View file

@ -24,6 +24,7 @@ env:
# - FLAVOR=SKY9X # - FLAVOR=SKY9X
# - FLAVOR=9XRPRO # - FLAVOR=9XRPRO
- FLAVOR=X9LITE - FLAVOR=X9LITE
- FLAVOR=X9LITES
- FLAVOR=X7 - FLAVOR=X7
- FLAVOR=T12 - FLAVOR=T12
- FLAVOR=XLITE - FLAVOR=XLITE
@ -32,6 +33,7 @@ env:
# - FLAVOR=X9D # - FLAVOR=X9D
# - FLAVOR=X9D+ # - FLAVOR=X9D+
# - FLAVOR=X9E # - FLAVOR=X9E
- FLAVOR=T16
- FLAVOR=HORUS - FLAVOR=HORUS
# - FLAVOR=X10 # - FLAVOR=X10
# - FLAVOR=X12Sr10 # - FLAVOR=X12Sr10

9
CMakeLists.txt
View file

@ -2,11 +2,11 @@ project(OpenTX)
set(VERSION_MAJOR "2") set(VERSION_MAJOR "2")
set(VERSION_MINOR "3") set(VERSION_MINOR "3")
set(VERSION_REVISION "0") set(VERSION_REVISION "2")
set(VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX}) set(VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})
set(VERSION_FAMILY ${VERSION_MAJOR}.${VERSION_MINOR}) set(VERSION_FAMILY ${VERSION_MAJOR}.${VERSION_MINOR})
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}${VERSION_SUFFIX}) set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}${VERSION_SUFFIX})
set(SDCARD_REVISION "0021") set(SDCARD_REVISION "0023")
set(SDCARD_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}V${SDCARD_REVISION}) set(SDCARD_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}V${SDCARD_REVISION})
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
@ -228,6 +228,11 @@ endif()
add_subdirectory(${RADIO_SRC_DIR}) add_subdirectory(${RADIO_SRC_DIR})
add_custom_target(tests-radio
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gtests-radio
DEPENDS gtests-radio
)
if(Qt5Core_FOUND AND NOT DISABLE_COMPANION) if(Qt5Core_FOUND AND NOT DISABLE_COMPANION)
add_subdirectory(${COMPANION_SRC_DIRECTORY}) add_subdirectory(${COMPANION_SRC_DIRECTORY})
add_custom_target(gtests DEPENDS gtests-radio gtests-companion) add_custom_target(gtests DEPENDS gtests-radio gtests-companion)

94
CREDITS.txt
View file

@ -27,6 +27,8 @@ Michael Byrne
[Companies and projects who have donated to OpenTX] [Companies and projects who have donated to OpenTX]
<a href="https://www.frsky-rc.com">FrSky (monthly)</a> <a href="https://www.frsky-rc.com">FrSky (monthly)</a>
<a href="https://www.flysky-cn.com/home">FlySky (monthly)</a>
<a href="https://www.jumper-rc.com">JumperRC (monthly)</a>
<a href="https://alofthobbies.com">Aloft Hobbies</a> <a href="https://alofthobbies.com">Aloft Hobbies</a>
<a href="https://jonathan.it">Jonathan Modellismo</a> <a href="https://jonathan.it">Jonathan Modellismo</a>
<a href="http://wstech.de">WsTech</a> <a href="http://wstech.de">WsTech</a>
@ -1539,3 +1541,95 @@ Piotr Wysocki
Thomas Halenbeck (monthly) Thomas Halenbeck (monthly)
Sjoerd Dost Sjoerd Dost
Ralph Gustafson Ralph Gustafson
Herbert Feix
Robert Costford
Taavi Tuisk
Carlos Quian
Noah Reinhart
Timothy Fry
Marc Stelzner
NXGRAPHICS
AIR-RC
Nicolas Deshaies
Jean-Francois Delhove
Hugo Daniel Farneti
RC electronic products
Adrian Andrei
Henk van de Kerkhof
Daniel Dubovski
Hans-Georg Böhm
Tiberiu Atudorei
Alessandro Apostoli (Yaapu!)
Kenneth Bonerigo
Frits van Voorst
Steven Dodge
Christian Buchinger
Patrick Blanc
Darrell Carew
Philippe Faure
Marco Lange
Aaron Tygart
Frantisek Vajbar
Mike Perkins
Knut Einar Kristensen
Georgios Papadopoulos
He Liu
Andrias Thomsen
Alain Azais
Alan Stuart
Fernando Rimoldi
James Snodgrass
Diego Mendoza Gonzalez
Dale Wheeler
Nico Wagner
James A Davey
Peter Glassey
Jeff Dillingham
Don Crowe
Nicola Claudio Rossi
Fabien Leroy
Tyler Nelson
Stuart Olson
Reinhard Plietsch
Manuel Spoerri
Paul Pearson
Thierry Laligand
Bruno Mexique
Uwe Jordt
Markus Goelzner
Jean-Claude Etiemble
Wojciech Winiarski
Michael Fleming
Russell G Shanks
Mike Sedgwick
William Goodrich
Marcel Schäfer
Joseph Santa Cruz
Gerald Roedel
James D McKeown
鄭 淳中
Matthias Wuethrich
Michael Tessler
John Beech
Stefan Möst
Thomas McGraw
Bruno N Russo Jr
Daniel Eikenkötter
Guy Poignonec
Gérard Falaise
Jacques Loubier
Kelly Warner
James Cox
Sidney B Harden
CG Tech Inc.
Richard Gopstein
Francesco Ziche
Jean Paul Duroch
Romane Oughlissi
Alexander Maciol
Udo Kastenholz
Jacek Wielogórski
Siegfried Preißler
Bernard Mohamedaly
John North
Thomas Wormsley

873
LICENSE
View file

@ -1,622 +1,281 @@
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007 Version 2, June 1991
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed. of this license document, but changing it is not allowed.
Preamble Preamble
The GNU General Public License is a free, copyleft license for The licenses for most software are designed to take away your
software and other kinds of works. freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
The licenses for most software and other practical works are designed software--to make sure the software is free for all its users. This
to take away your freedom to share and change the works. By contrast, General Public License applies to most of the Free Software
the GNU General Public License is intended to guarantee your freedom to Foundation's software and to any other program whose authors commit to
share and change all versions of a program--to make sure it remains free using it. (Some other Free Software Foundation software is covered by
software for all its users. We, the Free Software Foundation, use the the GNU Lesser General Public License instead.) You can apply it to
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. your programs, too.
When we speak of free software, we are referring to freedom, not When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for 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 this service if you wish), that you receive source code or can get it
want it, that you can change the software or use pieces of it in new if you want it, that you can change the software or use pieces of it
free programs, and that you know you can do these things. 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 To protect your rights, we need to make restrictions that forbid
these rights or asking you to surrender the rights. Therefore, you have anyone to deny you these rights or to ask you to surrender the rights.
certain responsibilities if you distribute copies of the software, or if These restrictions translate to certain responsibilities for you if you
you modify it: responsibilities to respect the freedom of others. distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether 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 gratis or for a fee, you must give the recipients all the rights that
freedoms that you received. You must make sure that they, too, receive you have. You must make sure that they, too, receive or can get the
or can get the source code. And you must show them these terms so they source code. And you must show them these terms so they know their
know their rights. rights.
Developers that use the GNU GPL protect your rights with two steps: We protect your rights with two steps: (1) copyright the software, and
(1) assert copyright on the software, and (2) offer you this License (2) offer you this license which gives you legal permission to copy,
giving you legal permission to copy, distribute and/or modify it. distribute and/or modify the software.
For the developers' and authors' protection, the GPL clearly explains Also, for each author's protection and ours, we want to make certain
that there is no warranty for this free software. For both users' and that everyone understands that there is no warranty for this free
authors' sake, the GPL requires that modified versions be marked as software. If the software is modified by someone else and passed on, we
changed, so that their problems will not be attributed erroneously to want its recipients to know that what they have is not the original, so
authors of previous versions. that any problems introduced by others will not reflect on the original
authors' reputations.
Some devices are designed to deny users access to install or run Finally, any free program is threatened constantly by software
modified versions of the software inside them, although the manufacturer patents. We wish to avoid the danger that redistributors of a free
can do so. This is fundamentally incompatible with the aim of program will individually obtain patent licenses, in effect making the
protecting users' freedom to change the software. The systematic program proprietary. To prevent this, we have made it clear that any
pattern of such abuse occurs in the area of products for individuals to patent must be licensed for everyone's free use or not licensed at all.
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 The precise terms and conditions for copying, distribution and
modification follow. modification follow.
TERMS AND CONDITIONS GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. Definitions.
0. This License applies to any program or other work which contains
"This License" refers to version 3 of the GNU General Public License. a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
"Copyright" also means copyright-like laws that apply to other kinds of refers to any such program or work, and a "work based on the Program"
works, such as semiconductor masks. means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
"The Program" refers to any copyrightable work licensed under this either verbatim or with modifications and/or translated into another
License. Each licensee is addressed as "you". "Licensees" and language. (Hereinafter, translation is included without limitation in
"recipients" may be individuals or organizations. the term "modification".) Each licensee is addressed as "you".
To "modify" a work means to copy from or adapt all or part of the work Activities other than copying, distribution and modification are not
in a fashion requiring copyright permission, other than the making of an covered by this License; they are outside its scope. The act of
exact copy. The resulting work is called a "modified version" of the running the Program is not restricted, and the output from the Program
earlier work or a work "based on" the earlier work. is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
A "covered work" means either the unmodified Program or a work based Whether that is true depends on what the Program does.
on the Program.
1. You may copy and distribute verbatim copies of the Program's
To "propagate" a work means to do anything with it that, without source code as you receive it, in any medium, provided that you
permission, would make you directly or secondarily liable for conspicuously and appropriately publish on each copy an appropriate
infringement under applicable copyright law, except executing it on a copyright notice and disclaimer of warranty; keep intact all the
computer or modifying a private copy. Propagation includes copying, notices that refer to this License and to the absence of any warranty;
distribution (with or without modification), making available to the and give any other recipients of the Program a copy of this License
public, and in some countries other activities as well. along with the Program.
To "convey" a work means any kind of propagation that enables other You may charge a fee for the physical act of transferring a copy, and
parties to make or receive copies. Mere interaction with a user through you may at your option offer warranty protection in exchange for a fee.
a computer network, with no transfer of a copy, is not conveying.
2. You may modify your copy or copies of the Program or any portion
An interactive user interface displays "Appropriate Legal Notices" of it, thus forming a work based on the Program, and copy and
to the extent that it includes a convenient and prominently visible distribute such modifications or work under the terms of Section 1
feature that (1) displays an appropriate copyright notice, and (2) above, provided that you also meet all of these conditions:
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the a) You must cause the modified files to carry prominent notices
work under this License, and how to view a copy of this License. If stating that you changed the files and the date of any change.
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion. b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
1. Source Code. part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source c) If the modified program normally reads commands interactively
form of a work. when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
A "Standard Interface" means an interface that either is an official announcement including an appropriate copyright notice and a
standard defined by a recognized standards body, or, in the case of notice that there is no warranty (or else, saying that you provide
interfaces specified for a particular programming language, one that a warranty) and that users may redistribute the program under
is widely used among developers working in that language. these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
The "System Libraries" of an executable work include anything, other does not normally print such an announcement, your work based on
than the work as a whole, that (a) is included in the normal form of the Program is not required to print an announcement.)
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 These requirements apply to the modified work as a whole. If
Major Component, or to implement a Standard Interface for which an identifiable sections of that work are not derived from the Program,
implementation is available to the public in source code form. A and can be reasonably considered independent and separate works in
"Major Component", in this context, means a major essential component themselves, then this License, and its terms, do not apply to those
(kernel, window system, and so on) of the specific operating system sections when you distribute them as separate works. But when you
(if any) on which the executable work runs, or a compiler used to distribute the same sections as part of a whole which is a work based
produce the work, or an object code interpreter used to run it. on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
The "Corresponding Source" for a work in object code form means all entire whole, and thus to each and every part regardless of who wrote it.
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to Thus, it is not the intent of this section to claim rights or contest
control those activities. However, it does not include the work's your rights to work written entirely by you; rather, the intent is to
System Libraries, or general-purpose tools or generally available free exercise the right to control the distribution of derivative or
programs which are used unmodified in performing those activities but collective works based on the Program.
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for In addition, mere aggregation of another work not based on the Program
the work, and the source code for shared libraries and dynamically with the Program (or with a work based on the Program) on a volume of
linked subprograms that the work is specifically designed to require, a storage or distribution medium does not bring the other work under
such as by intimate data communication or control flow between those the scope of this License.
subprograms and other parts of the work.
3. You may copy and distribute the Program (or a work based on it,
The Corresponding Source need not include anything that users under Section 2) in object code or executable form under the terms of
can regenerate automatically from other parts of the Corresponding Sections 1 and 2 above provided that you also do one of the following:
Source.
a) Accompany it with the complete corresponding machine-readable
The Corresponding Source for a work in source code form is that source code, which must be distributed under the terms of Sections
same work. 1 and 2 above on a medium customarily used for software interchange; or,
2. Basic Permissions. b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
All rights granted under this License are granted for the term of cost of physically performing source distribution, a complete
copyright on the Program, and are irrevocable provided the stated machine-readable copy of the corresponding source code, to be
conditions are met. This License explicitly affirms your unlimited distributed under the terms of Sections 1 and 2 above on a medium
permission to run the unmodified Program. The output from running a customarily used for software interchange; or,
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your c) Accompany it with the information you received as to the offer
rights of fair use or other equivalent, as provided by copyright law. to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
You may make, run and propagate covered works that you do not received the program in object code or executable form with such
convey, without conditions so long as your license otherwise remains an offer, in accord with Subsection b above.)
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you The source code for a work means the preferred form of the work for
with facilities for running those works, provided that you comply with making modifications to it. For an executable work, complete source
the terms of this License in conveying all material for which you do code means all the source code for all modules it contains, plus any
not control copyright. Those thus making or running the covered works associated interface definition files, plus the scripts used to
for you must do so exclusively on your behalf, under your direction control compilation and installation of the executable. However, as a
and control, on terms that prohibit them from making any copies of special exception, the source code distributed need not include
your copyrighted material outside their relationship with you. anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
Conveying under any other circumstances is permitted solely under operating system on which the executable runs, unless that component
the conditions stated below. Sublicensing is not allowed; section 10 itself accompanies the executable.
makes it unnecessary.
If distribution of executable or object code is made by offering
3. Protecting Users' Legal Rights From Anti-Circumvention Law. access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
No covered work shall be deemed part of an effective technological distribution of the source code, even though third parties are not
measure under any applicable law fulfilling obligations under article compelled to copy the source along with the object code.
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such 4. You may not copy, modify, sublicense, or distribute the Program
measures. except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
When you convey a covered work, you waive any legal power to forbid void, and will automatically terminate your rights under this License.
circumvention of technological measures to the extent such circumvention However, parties who have received copies, or rights, from you under
is effected by exercising rights under this License with respect to this License will not have their licenses terminated so long as such
the covered work, and you disclaim any intention to limit operation or parties remain in full compliance.
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of 5. You are not required to accept this License, since you have not
technological measures. signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
4. Conveying Verbatim Copies. prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
You may convey verbatim copies of the Program's source code as you Program), you indicate your acceptance of this License to do so, and
receive it, in any medium, provided that you conspicuously and all its terms and conditions for copying, distributing or modifying
appropriately publish on each copy an appropriate copyright notice; the Program or works based on it.
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code; 6. Each time you redistribute the Program (or any work based on the
keep intact all notices of the absence of any warranty; and give all Program), the recipient automatically receives a license from the
recipients a copy of this License along with the Program. original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
You may charge any price or no price for each copy that you convey, restrictions on the recipients' exercise of the rights granted herein.
and you may offer support or warranty protection for a fee. You are not responsible for enforcing compliance by third parties to
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. this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free 7. If, as a consequence of a court judgment or allegation of patent
patent license under the contributor's essential patent claims, to infringement or for any other reason (not limited to patent issues),
make, use, sell, offer for sale, import and otherwise run, modify and conditions are imposed on you (whether by court order, agreement or
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 otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a excuse you from the conditions of this License. If you cannot
covered work so as to satisfy simultaneously your obligations under this distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may License and any other pertinent obligations, then as a consequence you
not convey it at all. For example, if you agree to terms that obligate you may not distribute the Program at all. For example, if a patent
to collect a royalty for further conveying from those to whom you convey license would not permit royalty-free redistribution of the Program by
the Program, the only way you could satisfy both those terms and this all those who receive copies directly or indirectly through you, then
License would be to refrain entirely from conveying the Program. the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
13. Use with the GNU Affero General Public License. If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
Notwithstanding any other provision of this License, you have It is not the purpose of this section to induce you to infringe any
permission to link or combine any covered work with a work licensed patents or other property right claims or to contest validity of any
under version 3 of the GNU Affero General Public License into a single such claims; this section has the sole purpose of protecting the
combined work, and to convey the resulting work. The terms of this integrity of the free software distribution system, which is
License will continue to apply to the part which is the covered work, implemented by public license practices. Many people have made
but the special requirements of the GNU Affero General Public License, generous contributions to the wide range of software distributed
section 13, concerning interaction through a network will apply to the through that system in reliance on consistent application of that
combination as such. system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
14. Revised Versions of this License. This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
The Free Software Foundation may publish revised and/or new versions of 8. If the distribution and/or use of the Program is restricted in
the GNU General Public License from time to time. Such new versions will certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the 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 be similar in spirit to the present version, but may differ in detail to
address new problems or concerns. address new problems or concerns.
Each version is given a distinguishing version number. If the Each version is given a distinguishing version number. If the Program
Program specifies that a certain numbered version of the GNU General specifies a version number of this License which applies to it and "any
Public License "or any later version" applies to it, you have the later version", you have the option of following the terms and conditions
option of following the terms and conditions either of that numbered either of that version or of any later version published by the Free
version or of any later version published by the Free Software Software Foundation. If the Program does not specify a version number of
Foundation. If the Program does not specify a version number of the this License, you may choose any version ever published by the Free Software
GNU General Public License, you may choose any version ever published Foundation.
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future 10. If you wish to incorporate parts of the Program into other free
versions of the GNU General Public License can be used, that proxy's programs whose distribution conditions are different, write to the author
public statement of acceptance of a version permanently authorizes you to ask for permission. For software which is copyrighted by the Free
to choose that version for the Program. Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
Later license versions may give you additional or different NO WARRANTY
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. 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
ALL NECESSARY SERVICING, REPAIR OR CORRECTION. PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
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 END OF TERMS AND CONDITIONS
@ -628,15 +287,15 @@ 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 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 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 convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found. 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.> <one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author> Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
@ -644,31 +303,37 @@ the "copyright" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License along
along with this program. If not, see <https://www.gnu.org/licenses/>. with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail. Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short If the program is interactive, make it output a short notice like this
notice like this when it starts in an interactive mode: when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author> Gnomovision version 69, Copyright (C) year name of author
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details. under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands parts of the General Public License. Of course, the commands you use may
might be different; for a GUI interface, you would use an "about box". be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or school, You should also get your employer (if you work as a programmer) or your
if any, to sign a "copyright disclaimer" for the program, if necessary. school, if any, to sign a "copyright disclaimer" for the program, if
For more information on this, and how to apply and follow the GNU GPL, see necessary. Here is a sample; alter the names:
<https://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program Yoyodyne, Inc., hereby disclaims all copyright interest in the program
into proprietary programs. If your program is a subroutine library, you `Gnomovision' (which makes passes at compilers) written by James Hacker.
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 <signature of Ty Coon>, 1 April 1989
Public License instead of this License. But first, please read Ty Coon, President of Vice
<https://www.gnu.org/licenses/why-not-lgpl.html>.
This 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.

2
companion/src/CMakeLists.txt
View file

@ -347,6 +347,8 @@ elseif(PCB STREQUAL X9D+ AND PCBREV STREQUAL 2019)
set(FLAVOUR x9d+2019) set(FLAVOUR x9d+2019)
elseif(PCB STREQUAL X10 AND PCBREV STREQUAL EXPRESS) elseif(PCB STREQUAL X10 AND PCBREV STREQUAL EXPRESS)
set(FLAVOUR x10express) set(FLAVOUR x10express)
elseif(PCB STREQUAL X10 AND PCBREV STREQUAL T16)
set(FLAVOUR t16)
else() else()
string(TOLOWER ${PCB} FLAVOUR) string(TOLOWER ${PCB} FLAVOUR)
endif() endif()

19
companion/src/companion.qrc
View file

@ -136,6 +136,14 @@
<file>images/simulator/X9E/right.png</file> <file>images/simulator/X9E/right.png</file>
<file>images/simulator/X9E/right_enter.png</file> <file>images/simulator/X9E/right_enter.png</file>
<file>images/simulator/X9E/top.png</file> <file>images/simulator/X9E/top.png</file>
<file>images/simulator/X9D2019/bottom.png</file>
<file>images/simulator/X9D2019/left.png</file>
<file>images/simulator/X9D2019/left_exit.png</file>
<file>images/simulator/X9D2019/left_menu.png</file>
<file>images/simulator/X9D2019/left_page.png</file>
<file>images/simulator/X9D2019/right.png</file>
<file>images/simulator/X9D2019/right_enter.png</file>
<file>images/simulator/X9D2019/top.png</file>
<file>images/simulator/X9LITE/bottom.png</file> <file>images/simulator/X9LITE/bottom.png</file>
<file>images/simulator/X9LITE/left.png</file> <file>images/simulator/X9LITE/left.png</file>
<file>images/simulator/X9LITE/left_exit.png</file> <file>images/simulator/X9LITE/left_exit.png</file>
@ -170,6 +178,17 @@
<file>images/simulator/JumperT12/JumperT12-x.png</file> <file>images/simulator/JumperT12/JumperT12-x.png</file>
<file>images/simulator/JumperT12/JumperT12-center.png</file> <file>images/simulator/JumperT12/JumperT12-center.png</file>
<file>images/simulator/JumperT12/JumperT12-top.png</file> <file>images/simulator/JumperT12/JumperT12-top.png</file>
<file>images/simulator/JumperT16/left.png</file>
<file>images/simulator/JumperT16/right.png</file>
<file>images/simulator/JumperT16/top.png</file>
<file>images/simulator/JumperT16/bottom.png</file>
<file>images/simulator/JumperT16/left_mdl.png</file>
<file>images/simulator/JumperT16/left_page.png</file>
<file>images/simulator/JumperT16/left_scrnsht.png</file>
<file>images/simulator/JumperT16/left_sys.png</file>
<file>images/simulator/JumperT16/left_tele.png</file>
<file>images/simulator/JumperT16/right_ent.png</file>
<file>images/simulator/JumperT16/right_rtn.png</file>
<file>images/wizard/ailerons.png</file> <file>images/wizard/ailerons.png</file>
<file>images/wizard/airbrakes.png</file> <file>images/wizard/airbrakes.png</file>
<file>images/wizard/elevons.png</file> <file>images/wizard/elevons.png</file>

2
companion/src/datamodels/rawitemdatamodels.cpp
View file

@ -85,6 +85,7 @@ RawSwitchItemModel::RawSwitchItemModel(const GeneralSettings * const generalSett
Firmware * fw = getCurrentFirmware(); Firmware * fw = getCurrentFirmware();
// Descending switch direction: NOT (!) switches // Descending switch direction: NOT (!) switches
addItems(SWITCH_TYPE_ACT, -1);
addItems(SWITCH_TYPE_SENSOR, -CPN_MAX_SENSORS); addItems(SWITCH_TYPE_SENSOR, -CPN_MAX_SENSORS);
addItems(SWITCH_TYPE_TELEMETRY, -1); addItems(SWITCH_TYPE_TELEMETRY, -1);
addItems(SWITCH_TYPE_FLIGHT_MODE, -fw->getCapability(FlightModes)); addItems(SWITCH_TYPE_FLIGHT_MODE, -fw->getCapability(FlightModes));
@ -107,6 +108,7 @@ RawSwitchItemModel::RawSwitchItemModel(const GeneralSettings * const generalSett
addItems(SWITCH_TYPE_SENSOR, CPN_MAX_SENSORS); addItems(SWITCH_TYPE_SENSOR, CPN_MAX_SENSORS);
addItems(SWITCH_TYPE_ON, 1); addItems(SWITCH_TYPE_ON, 1);
addItems(SWITCH_TYPE_ONE, 1); addItems(SWITCH_TYPE_ONE, 1);
addItems(SWITCH_TYPE_ACT, 1);
} }
void RawSwitchItemModel::setDynamicItemData(QStandardItem * item, const RawSwitch & rsw) const void RawSwitchItemModel::setDynamicItemData(QStandardItem * item, const RawSwitch & rsw) const

20
companion/src/firmwares/boards.cpp
View file

@ -75,6 +75,8 @@ uint32_t Boards::getFourCC(Type board)
return 0x3378746F; return 0x3378746F;
case BOARD_TARANIS_X9LITE: case BOARD_TARANIS_X9LITE:
return 0x3C78746F; return 0x3C78746F;
case BOARD_TARANIS_X9LITES:
return 0x3E78746F;
case BOARD_SKY9X: case BOARD_SKY9X:
case BOARD_AR9X: case BOARD_AR9X:
case BOARD_9XRPRO: case BOARD_9XRPRO:
@ -87,6 +89,8 @@ uint32_t Boards::getFourCC(Type board)
return 0; return 0;
case BOARD_JUMPER_T12: case BOARD_JUMPER_T12:
return 0x3D78746F; return 0x3D78746F;
case BOARD_JUMPER_T16:
return 0x3F78746F;
case BOARD_UNKNOWN: case BOARD_UNKNOWN:
break; break;
} }
@ -113,6 +117,7 @@ int Boards::getEEpromSize(Board::Type board)
case BOARD_TARANIS_XLITE: case BOARD_TARANIS_XLITE:
case BOARD_TARANIS_X7: case BOARD_TARANIS_X7:
case BOARD_TARANIS_X9LITE: case BOARD_TARANIS_X9LITE:
case BOARD_TARANIS_X9LITES:
case BOARD_TARANIS_X9D: case BOARD_TARANIS_X9D:
case BOARD_TARANIS_X9DP: case BOARD_TARANIS_X9DP:
case BOARD_TARANIS_X9DP_2019: case BOARD_TARANIS_X9DP_2019:
@ -124,6 +129,7 @@ int Boards::getEEpromSize(Board::Type board)
case BOARD_HORUS_X12S: case BOARD_HORUS_X12S:
case BOARD_X10: case BOARD_X10:
case BOARD_X10_EXPRESS: case BOARD_X10_EXPRESS:
case BOARD_JUMPER_T16:
return 0; return 0;
} }
@ -149,6 +155,7 @@ int Boards::getFlashSize(Type board)
case BOARD_TARANIS_XLITE: case BOARD_TARANIS_XLITE:
case BOARD_TARANIS_X7: case BOARD_TARANIS_X7:
case BOARD_TARANIS_X9LITE: case BOARD_TARANIS_X9LITE:
case BOARD_TARANIS_X9LITES:
case BOARD_TARANIS_X9D: case BOARD_TARANIS_X9D:
case BOARD_TARANIS_X9DP: case BOARD_TARANIS_X9DP:
case BOARD_TARANIS_X9DP_2019: case BOARD_TARANIS_X9DP_2019:
@ -158,6 +165,7 @@ int Boards::getFlashSize(Type board)
case BOARD_HORUS_X12S: case BOARD_HORUS_X12S:
case BOARD_X10: case BOARD_X10:
case BOARD_X10_EXPRESS: case BOARD_X10_EXPRESS:
case BOARD_JUMPER_T16:
return FSIZE_HORUS; return FSIZE_HORUS;
case BOARD_UNKNOWN: case BOARD_UNKNOWN:
return FSIZE_MAX; return FSIZE_MAX;
@ -273,7 +281,7 @@ int Boards::getCapability(Board::Type board, Board::Capability capability)
return 2; return 2;
else if (IS_TARANIS_X9E(board)) else if (IS_TARANIS_X9E(board))
return 4; return 4;
else if (IS_HORUS_X10(board)) else if (IS_HORUS_X10(board) || IS_JUMPER_T16(board))
return 5; return 5;
else if (IS_HORUS_X12S(board)) else if (IS_HORUS_X12S(board))
return 3; return 3;
@ -289,7 +297,7 @@ int Boards::getCapability(Board::Type board, Board::Capability capability)
case Sliders: case Sliders:
if (IS_HORUS_X12S(board) || IS_TARANIS_X9E(board)) if (IS_HORUS_X12S(board) || IS_TARANIS_X9E(board))
return 4; return 4;
else if (IS_TARANIS_X9D(board) || IS_HORUS_X10(board)) else if (IS_TARANIS_X9D(board) || IS_HORUS_X10(board) || IS_JUMPER_T16(board))
return 2; return 2;
else else
return 0; return 0;
@ -454,7 +462,7 @@ QString Boards::getAnalogInputName(Board::Type board, int index)
if (index < DIM(pots)) if (index < DIM(pots))
return pots[index]; return pots[index];
} }
else if (IS_HORUS_X10(board)) { else if (IS_HORUS_X10(board) || IS_JUMPER_T16(board)) {
const QString pots[] = { const QString pots[] = {
"S1", "S1",
"6P", "6P",
@ -505,6 +513,8 @@ QString Boards::getBoardName(Board::Type board)
return "Taranis X9E"; return "Taranis X9E";
case BOARD_TARANIS_X9LITE: case BOARD_TARANIS_X9LITE:
return "Taranis X9-Lite"; return "Taranis X9-Lite";
case BOARD_TARANIS_X9LITES:
return "Taranis X9-Lite S";
case BOARD_SKY9X: case BOARD_SKY9X:
return "Sky9x"; return "Sky9x";
case BOARD_9XRPRO: case BOARD_9XRPRO:
@ -516,7 +526,9 @@ QString Boards::getBoardName(Board::Type board)
case BOARD_X10: case BOARD_X10:
return "Horus X10/X10S"; return "Horus X10/X10S";
case BOARD_X10_EXPRESS: case BOARD_X10_EXPRESS:
return "Horus X10 Express"; return "Horus X10/X10S Express";
case BOARD_JUMPER_T16:
return "Jumper T16";
default: default:
return tr("Unknown"); return tr("Unknown");
} }

21
companion/src/firmwares/boards.h
View file

@ -50,10 +50,12 @@ namespace Board {
BOARD_TARANIS_XLITE, BOARD_TARANIS_XLITE,
BOARD_TARANIS_XLITES, BOARD_TARANIS_XLITES,
BOARD_TARANIS_X9LITE, BOARD_TARANIS_X9LITE,
BOARD_TARANIS_X9LITES,
BOARD_JUMPER_T12, BOARD_JUMPER_T12,
BOARD_JUMPER_T16,
}; };
constexpr int BOARD_TYPE_MAX = BOARD_JUMPER_T12 ; constexpr int BOARD_TYPE_MAX = BOARD_JUMPER_T16 ;
enum PotType enum PotType
{ {
@ -222,6 +224,11 @@ inline bool IS_JUMPER_T12(Board::Type board)
return board == Board::BOARD_JUMPER_T12; return board == Board::BOARD_JUMPER_T12;
} }
inline bool IS_JUMPER_T16(Board::Type board)
{
return board == Board::BOARD_JUMPER_T16;
}
inline bool IS_TARANIS_XLITE(Board::Type board) inline bool IS_TARANIS_XLITE(Board::Type board)
{ {
return board == Board::BOARD_TARANIS_XLITE || board == Board::BOARD_TARANIS_XLITES; return board == Board::BOARD_TARANIS_XLITE || board == Board::BOARD_TARANIS_XLITES;
@ -239,7 +246,7 @@ inline bool IS_TARANIS_X7(Board::Type board)
inline bool IS_TARANIS_X9LITE(Board::Type board) inline bool IS_TARANIS_X9LITE(Board::Type board)
{ {
return board == Board::BOARD_TARANIS_X9LITE; return board == Board::BOARD_TARANIS_X9LITE || board == Board::BOARD_TARANIS_X9LITES;
} }
inline bool IS_TARANIS_X9(Board::Type board) inline bool IS_TARANIS_X9(Board::Type board)
@ -284,7 +291,7 @@ inline bool IS_HORUS_X12S(Board::Type board)
inline bool IS_HORUS(Board::Type board) inline bool IS_HORUS(Board::Type board)
{ {
return IS_HORUS_X12S(board) || IS_HORUS_X10(board); return IS_HORUS_X12S(board) || IS_HORUS_X10(board) || IS_JUMPER_T16(board);
} }
inline bool IS_HORUS_OR_TARANIS(Board::Type board) inline bool IS_HORUS_OR_TARANIS(Board::Type board)
@ -309,7 +316,13 @@ inline bool HAS_LARGE_LCD(Board::Type board)
inline bool HAS_EXTERNAL_ANTENNA(Board::Type board) inline bool HAS_EXTERNAL_ANTENNA(Board::Type board)
{ {
return (IS_HORUS(board) && board != Board::BOARD_X10_EXPRESS) || (IS_TARANIS_XLITE(board) && !IS_TARANIS_XLITES(board)); return (board == Board::BOARD_X10 || board == Board::BOARD_HORUS_X12S || (IS_TARANIS_XLITE(board) && !IS_TARANIS_XLITES(board)));
}
inline bool IS_ACCESS_RADIO(Board::Type board, QString &id)
{
return (IS_TARANIS_XLITES(board) || IS_TARANIS_X9LITE(board) || board == Board::BOARD_TARANIS_X9DP_2019 || board == Board::BOARD_X10_EXPRESS ||
(IS_HORUS(board) && id.contains("internalaccess")));
} }
#endif // _BOARDS_H_ #endif // _BOARDS_H_

4
companion/src/firmwares/generalsettings.cpp
View file

@ -88,7 +88,7 @@ GeneralSettings::GeneralSettings()
vBatMin = -5; //8,5V vBatMin = -5; //8,5V
vBatMax = -5; //11,5V vBatMax = -5; //11,5V
} }
else if (IS_TARANIS_XLITE(board) || IS_HORUS_X10(board)) { else if (IS_TARANIS_XLITE(board) || IS_HORUS_X10(board) || IS_JUMPER_T16(board)) {
// Lipo 2S // Lipo 2S
vBatWarn = 66; vBatWarn = 66;
vBatMin = -23; // 6.7V vBatMin = -23; // 6.7V
@ -267,7 +267,7 @@ void GeneralSettings::setDefaultControlTypes(Board::Type board)
sliderConfig[2] = Board::SLIDER_WITH_DETENT; sliderConfig[2] = Board::SLIDER_WITH_DETENT;
sliderConfig[3] = Board::SLIDER_WITH_DETENT; sliderConfig[3] = Board::SLIDER_WITH_DETENT;
} }
else if (IS_TARANIS_X9(board) || IS_HORUS_X10(board)) { else if (IS_TARANIS_X9(board) || IS_HORUS_X10(board) || IS_JUMPER_T16(board)) {
sliderConfig[0] = Board::SLIDER_WITH_DETENT; sliderConfig[0] = Board::SLIDER_WITH_DETENT;
sliderConfig[1] = Board::SLIDER_WITH_DETENT; sliderConfig[1] = Board::SLIDER_WITH_DETENT;
} }

2
companion/src/firmwares/generalsettings.h
View file

@ -109,6 +109,7 @@ class GeneralSettings {
bool adjustRTC; bool adjustRTC;
bool optrexDisplay; bool optrexDisplay;
unsigned int inactivityTimer; unsigned int inactivityTimer;
unsigned int telemetryBaudrate;
bool minuteBeep; bool minuteBeep;
bool preBeep; bool preBeep;
bool flashBeep; bool flashBeep;
@ -140,6 +141,7 @@ class GeneralSettings {
unsigned int rotarySteps; unsigned int rotarySteps;
unsigned int countryCode; unsigned int countryCode;
bool jitterFilter; bool jitterFilter;
bool rtcCheckDisable;
unsigned int imperial; unsigned int imperial;
char ttsLanguage[2+1]; char ttsLanguage[2+1];
int beepVolume; int beepVolume;

32
companion/src/firmwares/moduledata.cpp
View file

@ -57,6 +57,30 @@ bool ModuleData::isPxx1Module() const
} }
} }
bool ModuleData::supportRxNum() const
{
switch (protocol) {
case PULSES_PXX_XJT_X16:
case PULSES_PXX_R9M:
case PULSES_PXX_R9M_LITE:
case PULSES_PXX_R9M_LITE_PRO:
case PULSES_MULTIMODULE:
case PULSES_ACCESS_ISRM:
case PULSES_ACCST_ISRM_D16:
case PULSES_ACCESS_R9M:
case PULSES_ACCESS_R9M_LITE:
case PULSES_ACCESS_R9M_LITE_PRO:
case PULSES_XJT_LITE_X16:
case PULSES_XJT_LITE_LR12:
case PULSES_PXX_XJT_LR12:
case PULSES_LP45:
case PULSES_DSM2:
case PULSES_DSMX:
return true;
default:
return false;
}
}
QString ModuleData::rfProtocolToString() const QString ModuleData::rfProtocolToString() const
{ {
@ -127,12 +151,12 @@ QString ModuleData::protocolToString(unsigned protocol)
"FrSky XJT (D16)", "FrSky XJT (D8)", "FrSky XJT (LR12)", "FrSky DJT", "FrSky XJT (D16)", "FrSky XJT (D8)", "FrSky XJT (LR12)", "FrSky DJT",
"TBS Crossfire", "TBS Crossfire",
"DIY Multiprotocol Module", "DIY Multiprotocol Module",
"FrSky PXX R9M", "FrSky R9M",
"FrSky PXX R9M Lite", "FrSky R9M Lite",
"FrSky PXX R9M Lite Pro", "FrSky R9M Lite Pro",
"SBUS output at VBat", "SBUS output at VBat",
"FrSky ACCESS ISRM", "FrSky ACCST ISRM D16", "FrSky ACCESS ISRM", "FrSky ACCST ISRM D16",
"FrSky ACCESS R9M", "FrSky ACCESS R9M 2019",
"FrSky ACCESS R9M Lite", "FrSky ACCESS R9M Lite",
"FrSky ACCESS R9M Lite Pro", "FrSky ACCESS R9M Lite Pro",
"FrSky XJT lite (D16)", "FrSky XJT lite (D8)", "FrSky XJT lite (LR12)" "FrSky XJT lite (D16)", "FrSky XJT lite (D8)", "FrSky XJT lite (LR12)"

6
companion/src/firmwares/moduledata.h
View file

@ -114,7 +114,10 @@ enum MultiModuleRFProtocols {
MODULE_SUBTYPE_MULTI_POTENSIC, MODULE_SUBTYPE_MULTI_POTENSIC,
MODULE_SUBTYPE_MULTI_ZSX, MODULE_SUBTYPE_MULTI_ZSX,
MODULE_SUBTYPE_MULTI_FLYZONE, MODULE_SUBTYPE_MULTI_FLYZONE,
MODULE_SUBTYPE_MULTI_LAST = MODULE_SUBTYPE_MULTI_FLYZONE MODULE_SUBTYPE_MULTI_SCANNER,
MODULE_SUBTYPE_MULTI_FRSKYX_RX,
MODULE_SUBTYPE_MULTI_AFHDS2A_RX,
MODULE_SUBTYPE_MULTI_LAST = MODULE_SUBTYPE_MULTI_AFHDS2A_RX
}; };
enum TrainerProtocol { enum TrainerProtocol {
@ -183,6 +186,7 @@ class ModuleData {
void convert(RadioDataConversionState & cstate); void convert(RadioDataConversionState & cstate);
bool isPxx2Module() const; bool isPxx2Module() const;
bool isPxx1Module() const; bool isPxx1Module() const;
bool supportRxNum() const;
QString polarityToString() const { return ppm.pulsePol ? tr("Positive") : tr("Negative"); } QString polarityToString() const { return ppm.pulsePol ? tr("Positive") : tr("Negative"); }
QString rfProtocolToString() const; QString rfProtocolToString() const;
QString subTypeToString(int type = -1) const; QString subTypeToString(int type = -1) const;

6
companion/src/firmwares/multiprotocols.cpp
View file

@ -71,6 +71,7 @@ static const QStringList STR_SUBTYPE_REDPINE {"Fast", "Slow"};
static const QStringList STR_SUBTYPE_POTENSIC {"A20 Firefly"}; static const QStringList STR_SUBTYPE_POTENSIC {"A20 Firefly"};
static const QStringList STR_SUBTYPE_ZSX {"JJRC ZSX-280"}; static const QStringList STR_SUBTYPE_ZSX {"JJRC ZSX-280"};
static const QStringList STR_SUBTYPE_FLYZONE {"FZ-410 TX"}; static const QStringList STR_SUBTYPE_FLYZONE {"FZ-410 TX"};
static const QStringList STR_SUBTYPE_FRSKYX_RX {"D16 FCC", "D16 LBT"};
static const QStringList NO_SUBTYPE {STR_MULTI_DEFAULT}; static const QStringList NO_SUBTYPE {STR_MULTI_DEFAULT};
@ -108,7 +109,7 @@ const Multiprotocols multiProtocols {
{MODULE_SUBTYPE_MULTI_HITEC, 2, false, STR_SUBTYPE_HITEC, STR_MULTI_RFTUNE}, {MODULE_SUBTYPE_MULTI_HITEC, 2, false, STR_SUBTYPE_HITEC, STR_MULTI_RFTUNE},
{MODULE_SUBTYPE_MULTI_BUGS_MINI, 1, false, STR_SUBTYPE_BUGS_MINI, nullptr}, {MODULE_SUBTYPE_MULTI_BUGS_MINI, 1, false, STR_SUBTYPE_BUGS_MINI, nullptr},
{MODULE_SUBTYPE_MULTI_TRAXXAS, 0, false, STR_SUBTYPE_TRAXXAS, nullptr}, {MODULE_SUBTYPE_MULTI_TRAXXAS, 0, false, STR_SUBTYPE_TRAXXAS, nullptr},
{MODULE_SUBTYPE_MULTI_E01X, 2, false, STR_SUBTYPE_E01X, nullptr}, {MODULE_SUBTYPE_MULTI_E01X, 2, false, STR_SUBTYPE_E01X, STR_MULTI_OPTION},
{MODULE_SUBTYPE_MULTI_V911S, 0, false, NO_SUBTYPE, STR_MULTI_RFTUNE}, {MODULE_SUBTYPE_MULTI_V911S, 0, false, NO_SUBTYPE, STR_MULTI_RFTUNE},
{MODULE_SUBTYPE_MULTI_GD00X, 1, false, STR_SUBTYPE_GD00X, nullptr}, {MODULE_SUBTYPE_MULTI_GD00X, 1, false, STR_SUBTYPE_GD00X, nullptr},
{MODULE_SUBTYPE_MULTI_KF606, 0, false, NO_SUBTYPE, STR_MULTI_RFTUNE}, {MODULE_SUBTYPE_MULTI_KF606, 0, false, NO_SUBTYPE, STR_MULTI_RFTUNE},
@ -116,6 +117,7 @@ const Multiprotocols multiProtocols {
{MODULE_SUBTYPE_MULTI_POTENSIC, 0, false, STR_SUBTYPE_POTENSIC, nullptr}, {MODULE_SUBTYPE_MULTI_POTENSIC, 0, false, STR_SUBTYPE_POTENSIC, nullptr},
{MODULE_SUBTYPE_MULTI_ZSX, 0, false, STR_SUBTYPE_ZSX, nullptr}, {MODULE_SUBTYPE_MULTI_ZSX, 0, false, STR_SUBTYPE_ZSX, nullptr},
{MODULE_SUBTYPE_MULTI_FLYZONE, 0, false, STR_SUBTYPE_FLYZONE, nullptr}, {MODULE_SUBTYPE_MULTI_FLYZONE, 0, false, STR_SUBTYPE_FLYZONE, nullptr},
{MODULE_SUBTYPE_MULTI_FRSKYX_RX, 1, false, STR_SUBTYPE_FRSKYX_RX, STR_MULTI_RFTUNE},
{MM_RF_CUSTOM_SELECTED, 7, true, STR_SUBTYPE_CUSTOM, STR_MULTI_OPTION}, {MM_RF_CUSTOM_SELECTED, 7, true, STR_SUBTYPE_CUSTOM, STR_MULTI_OPTION},
// Sentinel and default for protocols not listed above (MM_RF_CUSTOM is 0xff) // Sentinel and default for protocols not listed above (MM_RF_CUSTOM is 0xff)
@ -158,7 +160,7 @@ QString Multiprotocols::protocolToString(int protocol, bool custom)
"Bayang", "ESky", "MT99XX", "MJXQ", "Shenqi", "FY326", "SFHSS", "J6 PRO","FQ777","Assan","Hontai","Open LRS", "Bayang", "ESky", "MT99XX", "MJXQ", "Shenqi", "FY326", "SFHSS", "J6 PRO","FQ777","Assan","Hontai","Open LRS",
"FlySky AFHDS2A", "Q2x2", "Walkera", "Q303", "GW008", "DM002", "Cabell", "ESky 150", "H8 3D", "Corona", "CFlie", "FlySky AFHDS2A", "Q2x2", "Walkera", "Q303", "GW008", "DM002", "Cabell", "ESky 150", "H8 3D", "Corona", "CFlie",
"Hitec", "Wfly", "Bugs", "Bugs Mini", "Traxxas", "NCC-1701-A", "E01X", "WL Heli V911S", "GD00X", "Volantex V761", "Hitec", "Wfly", "Bugs", "Bugs Mini", "Traxxas", "NCC-1701-A", "E01X", "WL Heli V911S", "GD00X", "Volantex V761",
"KFPlan KF606", "Redpine", "Potensic", "ZXS", "FlyZone" "KFPlan KF606", "Redpine", "Potensic", "ZXS", "FlyZone", "Scanner", "FrSky RX", "FlySky AFHDS2A RX"
}); });
if (protocol == MM_RF_CUSTOM_SELECTED || custom) if (protocol == MM_RF_CUSTOM_SELECTED || custom)

37
companion/src/firmwares/opentx/opentxeeprom.cpp
View file

@ -217,6 +217,10 @@ class SwitchesConversionTable: public ConversionTable {
addConversion(RawSwitch(SWITCH_TYPE_SENSOR, i), val++); addConversion(RawSwitch(SWITCH_TYPE_SENSOR, i), val++);
} }
} }
if (version >= 219) {
addConversion(RawSwitch(SWITCH_TYPE_ACT, -1), -val+offset);
addConversion(RawSwitch(SWITCH_TYPE_ACT, 1), val++);
}
} }
@ -1914,7 +1918,7 @@ class SensorField: public TransformedField {
if (sensor.type == SensorData::TELEM_TYPE_CUSTOM) { if (sensor.type == SensorData::TELEM_TYPE_CUSTOM) {
_id = sensor.id; _id = sensor.id;
_subid = sensor.subid; _subid = sensor.subid;
_instance = (sensor.instance & 0x1F) | (sensor.rxIdx << 5) | (sensor.moduleIdx << 7); _instance = sensor.instance == 0 ? 0 : ((sensor.instance - 1) & 0x1F) | (sensor.rxIdx << 5) | (sensor.moduleIdx << 7);
_ratio = sensor.ratio; _ratio = sensor.ratio;
_offset = sensor.offset; _offset = sensor.offset;
} }
@ -1942,12 +1946,12 @@ class SensorField: public TransformedField {
sensor.id = _id; sensor.id = _id;
sensor.subid = _subid; sensor.subid = _subid;
if (model.moduleData[0].isPxx1Module() || model.moduleData[1].isPxx1Module()) { if (model.moduleData[0].isPxx1Module() || model.moduleData[1].isPxx1Module()) {
sensor.instance = (_instance & 0x1F) + (version <= 218 ? -1 : 0); // 5 bits instance sensor.instance = (_instance & 0x1F) + (version <= 218 ? 0 : 1); // 5 bits instance
sensor.rxIdx = 0x03; // 2 bits Rx idx sensor.rxIdx = 0x03; // 2 bits Rx idx
sensor.moduleIdx = 0x01; // 1 bit module idx sensor.moduleIdx = 0x01; // 1 bit module idx
} }
else { else {
sensor.instance = _instance & 0x1F; sensor.instance = (_instance & 0x1F) + 1;
sensor.rxIdx = (_instance >> 5) & 0x03; // 2 bits Rx idx sensor.rxIdx = (_instance >> 5) & 0x03; // 2 bits Rx idx
sensor.moduleIdx = (_instance >> 7) & 0x1; // 1 bit module idx sensor.moduleIdx = (_instance >> 7) & 0x1; // 1 bit module idx
} }
@ -2048,7 +2052,6 @@ class ModuleUnionField: public UnionField<unsigned int> {
void beforeExport() override void beforeExport() override
{ {
module.rfProtocol = module.multi.rfProtocol & 0xf;
rfProtExtra = (module.multi.rfProtocol >> 4) & 0x03; rfProtExtra = (module.multi.rfProtocol >> 4) & 0x03;
} }
@ -2089,9 +2092,6 @@ class ModuleUnionField: public UnionField<unsigned int> {
void beforeExport() override void beforeExport() override
{ {
if (module.protocol >= PULSES_PXX_XJT_X16 && module.protocol <= PULSES_PXX_XJT_LR12) {
module.subType = module.protocol - PULSES_PXX_XJT_X16;
}
} }
void afterImport() override void afterImport() override
@ -2132,9 +2132,6 @@ class ModuleUnionField: public UnionField<unsigned int> {
void beforeExport() override void beforeExport() override
{ {
if (module.protocol == PULSES_ACCST_ISRM_D16 || module.protocol == PULSES_ACCESS_ISRM) {
module.subType = module.protocol - PULSES_ACCESS_ISRM;
}
for (int i=0; i<PXX2_MAX_RECEIVERS_PER_MODULE; i++) { for (int i=0; i<PXX2_MAX_RECEIVERS_PER_MODULE; i++) {
for (int pos=0; pos<PXX2_LEN_RX_NAME+1; pos++) { for (int pos=0; pos<PXX2_LEN_RX_NAME+1; pos++) {
@ -2211,6 +2208,15 @@ class ModuleField: public TransformedField {
if (module.protocol >= PULSES_LP45 && module.protocol <= PULSES_DSMX) { if (module.protocol >= PULSES_LP45 && module.protocol <= PULSES_DSMX) {
module.rfProtocol = module.protocol - PULSES_LP45; module.rfProtocol = module.protocol - PULSES_LP45;
} }
else if (module.protocol == PULSES_ACCST_ISRM_D16 || module.protocol == PULSES_ACCESS_ISRM) {
module.subType = module.protocol - PULSES_ACCESS_ISRM;
}
else if (module.protocol >= PULSES_PXX_XJT_X16 && module.protocol <= PULSES_PXX_XJT_LR12) {
module.subType = module.protocol - PULSES_PXX_XJT_X16;
}
else if (module.protocol == PULSES_MULTIMODULE) {
module.rfProtocol = module.multi.rfProtocol & 0xf;
}
} }
void afterImport() override void afterImport() override
@ -2361,8 +2367,8 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, Board::Type board, unsig
internalField.Append(new UnsignedField<8>(this, modelData.rssiSource)); internalField.Append(new UnsignedField<8>(this, modelData.rssiSource));
if (IS_TARANIS_X9(board)) { if (IS_TARANIS_X9(board)) {
// TODO TOPBAR internalField.Append(new UnsignedField<8>(this, modelData.frsky.voltsSource));
internalField.Append(new SpareBitsField<16>(this)); internalField.Append(new UnsignedField<8>(this, modelData.frsky.altitudeSource));
} }
internalField.Append(new BoolField<1>(this, modelData.rssiAlarms.disabled)); internalField.Append(new BoolField<1>(this, modelData.rssiAlarms.disabled));
@ -2395,7 +2401,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, Board::Type board, unsig
if (version >= 219) { if (version >= 219) {
// Trainer PPM settings // Trainer PPM settings
internalField.Append(new SpareBitsField<3>(this)); // TODO mode internalField.Append(new UnsignedField<3>(this, modelData.trainerMode));
internalField.Append(new SpareBitsField<5>(this)); internalField.Append(new SpareBitsField<5>(this));
internalField.Append(new UnsignedField<8>(this, modelData.moduleData[2].channelsStart)); internalField.Append(new UnsignedField<8>(this, modelData.moduleData[2].channelsStart));
internalField.Append(new ConversionField<SignedField<8> >(this, modelData.moduleData[2].channelsCount, -8)); internalField.Append(new ConversionField<SignedField<8> >(this, modelData.moduleData[2].channelsCount, -8));
@ -2571,7 +2577,8 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
internalField.Append(new SignedField<2>(this, generalData.antennaMode)); internalField.Append(new SignedField<2>(this, generalData.antennaMode));
else else
internalField.Append(new SpareBitsField<2>(this)); internalField.Append(new SpareBitsField<2>(this));
internalField.Append(new SpareBitsField<3>(this)); internalField.Append(new BoolField<1>(this, generalData.rtcCheckDisable));
internalField.Append(new SpareBitsField<2>(this));
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
internalField.Append(new SignedField<16>(this, generalData.trainer.calib[i])); internalField.Append(new SignedField<16>(this, generalData.trainer.calib[i]));
@ -2602,7 +2609,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
} }
internalField.Append(new UnsignedField<8>(this, generalData.inactivityTimer)); internalField.Append(new UnsignedField<8>(this, generalData.inactivityTimer));
internalField.Append(new SpareBitsField<3>(this)); // telemetryBaudrate internalField.Append(new UnsignedField<3>(this, generalData.telemetryBaudrate));
if (IS_HORUS(board)) if (IS_HORUS(board))
internalField.Append(new SpareBitsField<3>(this)); internalField.Append(new SpareBitsField<3>(this));
else if (IS_TARANIS(board)) else if (IS_TARANIS(board))

40
companion/src/firmwares/opentx/opentxinterface.cpp
View file

@ -68,6 +68,8 @@ const char * OpenTxEepromInterface::getName()
return "OpenTX for Gruvin9x board / 9X"; return "OpenTX for Gruvin9x board / 9X";
case BOARD_JUMPER_T12: case BOARD_JUMPER_T12:
return "OpenTX for Jumper T12"; return "OpenTX for Jumper T12";
case BOARD_JUMPER_T16:
return "OpenTX for Jumper T16";
case BOARD_TARANIS_X9D: case BOARD_TARANIS_X9D:
return "OpenTX for FrSky Taranis X9D"; return "OpenTX for FrSky Taranis X9D";
case BOARD_TARANIS_X9DP: case BOARD_TARANIS_X9DP:
@ -78,6 +80,8 @@ const char * OpenTxEepromInterface::getName()
return "OpenTX for FrSky Taranis X9E"; return "OpenTX for FrSky Taranis X9E";
case BOARD_TARANIS_X7: case BOARD_TARANIS_X7:
return "OpenTX for FrSky Taranis X7"; return "OpenTX for FrSky Taranis X7";
case BOARD_TARANIS_X9LITES:
return "OpenTX for FrSky Taranis X9-Lite S";
case BOARD_TARANIS_X9LITE: case BOARD_TARANIS_X9LITE:
return "OpenTX for FrSky Taranis X9-Lite"; return "OpenTX for FrSky Taranis X9-Lite";
case BOARD_TARANIS_XLITE: case BOARD_TARANIS_XLITE:
@ -445,7 +449,7 @@ int OpenTxFirmware::getCapability(::Capability capability)
else else
return id.contains("imperial") ? 1 : 0; return id.contains("imperial") ? 1 : 0;
case ModelImage: case ModelImage:
return (board == BOARD_TARANIS_X9D || IS_TARANIS_PLUS(board) || IS_HORUS(board)); return (board == BOARD_TARANIS_X9D || IS_TARANIS_PLUS(board) || board == BOARD_TARANIS_X9DP_2019 || IS_HORUS(board));
case HasBeeper: case HasBeeper:
return (!IS_ARM(board)); return (!IS_ARM(board));
case HasPxxCountry: case HasPxxCountry:
@ -768,18 +772,20 @@ bool OpenTxFirmware::isAvailable(PulsesProtocol proto, int port)
return true; return true;
case PULSES_PXX_XJT_X16: case PULSES_PXX_XJT_X16:
case PULSES_PXX_XJT_LR12: case PULSES_PXX_XJT_LR12:
return !(IS_TARANIS_XLITES(board) || IS_TARANIS_X9LITE(board)); return !IS_ACCESS_RADIO(board, id) && board != BOARD_JUMPER_T16;
case PULSES_PXX_XJT_D8: case PULSES_PXX_XJT_D8:
return !(IS_TARANIS_XLITES(board) || IS_TARANIS_X9LITE(board) || id.contains("eu")); return !(IS_ACCESS_RADIO(board, id) || id.contains("eu")) && board != BOARD_JUMPER_T16;
case PULSES_PPM: case PULSES_PPM:
return id.contains("internalppm"); return id.contains("internalppm");
case PULSES_ACCESS_ISRM: case PULSES_ACCESS_ISRM:
case PULSES_ACCST_ISRM_D16: case PULSES_ACCST_ISRM_D16:
return IS_TARANIS_XLITES(board) || IS_TARANIS_X9LITE(board) || board == BOARD_TARANIS_X9DP_2019 || board == BOARD_X10_EXPRESS || (IS_HORUS(board) && id.contains("internalaccess")); return IS_ACCESS_RADIO(board, id);
case PULSES_MULTIMODULE:
return id.contains("internalmulti");
default: default:
return false; return false;
} }
case 1: case 1:
switch (proto) { switch (proto) {
case PULSES_OFF: case PULSES_OFF:
@ -797,13 +803,15 @@ bool OpenTxFirmware::isAvailable(PulsesProtocol proto, int port)
case PULSES_MULTIMODULE: case PULSES_MULTIMODULE:
case PULSES_CROSSFIRE: case PULSES_CROSSFIRE:
return true; return true;
case PULSES_ACCESS_R9M:
return IS_TARANIS_XLITE(board) || IS_TARANIS_X9LITE(board) || board == BOARD_TARANIS_X9DP_2019 || board == BOARD_X10_EXPRESS || (IS_HORUS(board) && id.contains("internalaccess"));
case PULSES_PXX_R9M_LITE:
case PULSES_ACCESS_R9M_LITE: case PULSES_ACCESS_R9M_LITE:
case PULSES_ACCESS_R9M_LITE_PRO: case PULSES_ACCESS_R9M_LITE_PRO:
return (IS_TARANIS_XLITES(board) || IS_TARANIS_X9LITE(board));
case PULSES_XJT_LITE_X16: case PULSES_XJT_LITE_X16:
case PULSES_XJT_LITE_D8: case PULSES_XJT_LITE_D8:
case PULSES_XJT_LITE_LR12: case PULSES_XJT_LITE_LR12:
return (IS_TARANIS_XLITES(board) || IS_TARANIS_X9LITE(board)); return (IS_TARANIS_XLITE(board) || IS_TARANIS_X9LITE(board));
default: default:
return false; return false;
} }
@ -1214,7 +1222,7 @@ void registerOpenTxFirmwares()
/* FrSky Taranis X9D+ 2019 board */ /* FrSky Taranis X9D+ 2019 board */
firmware = new OpenTxFirmware("opentx-x9d+2019", Firmware::tr("FrSky Taranis X9D+ 2019"), BOARD_TARANIS_X9DP_2019); firmware = new OpenTxFirmware("opentx-x9d+2019", Firmware::tr("FrSky Taranis X9D+ 2019"), BOARD_TARANIS_X9DP_2019);
addOpenTxTaranisOptions(firmware); addOpenTxTaranisOptions(firmware);
addPPMInternalModuleHack(firmware); firmware->addOption("autoupdate", Firmware::tr("Support for auto update on boot"));
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* FrSky Taranis X9D board */ /* FrSky Taranis X9D board */
@ -1238,6 +1246,12 @@ void registerOpenTxFirmwares()
firmware->addOption("autoupdate", Firmware::tr("Support for auto update on boot")); firmware->addOption("autoupdate", Firmware::tr("Support for auto update on boot"));
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* FrSky X9-LiteS board */
firmware = new OpenTxFirmware("opentx-x9lites", Firmware::tr("FrSky Taranis X9-Lite S"), BOARD_TARANIS_X9LITES);
addOpenTxTaranisOptions(firmware);
firmware->addOption("autoupdate", Firmware::tr("Support for auto update on boot"));
registerOpenTxFirmware(firmware);
/* FrSky X7 board */ /* FrSky X7 board */
firmware = new OpenTxFirmware("opentx-x7", Firmware::tr("FrSky Taranis X7 / X7S"), BOARD_TARANIS_X7); firmware = new OpenTxFirmware("opentx-x7", Firmware::tr("FrSky Taranis X7 / X7S"), BOARD_TARANIS_X7);
addOpenTxTaranisOptions(firmware); addOpenTxTaranisOptions(firmware);
@ -1262,8 +1276,9 @@ void registerOpenTxFirmwares()
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* FrSky X10 Express board */ /* FrSky X10 Express board */
firmware = new OpenTxFirmware("opentx-x10express", Firmware::tr("FrSky Horus X10 Express"), BOARD_X10_EXPRESS); firmware = new OpenTxFirmware("opentx-x10express", Firmware::tr("FrSky Horus X10 / X10S Express"), BOARD_X10_EXPRESS);
addOpenTxFrskyOptions(firmware); addOpenTxFrskyOptions(firmware);
firmware->addOption("autoupdate", Firmware::tr("Support for auto update on boot"));
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* FrSky X12 (Horus) board */ /* FrSky X12 (Horus) board */
@ -1283,6 +1298,13 @@ void registerOpenTxFirmwares()
addOpenTxFontOptions(firmware); addOpenTxFontOptions(firmware);
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* Jumper T16 board */
firmware = new OpenTxFirmware("opentx-t16", Firmware::tr("Jumper T16 / T16+"), BOARD_JUMPER_T16);
addOpenTxFrskyOptions(firmware);
firmware->addOption("internalmulti", Firmware::tr("Support for MULTI internal module"));
firmware->addOption("bluetooth", Firmware::tr("Support for bluetooth module"));
registerOpenTxFirmware(firmware);
/* 9XR-Pro */ /* 9XR-Pro */
firmware = new OpenTxFirmware("opentx-9xrpro", Firmware::tr("Turnigy 9XR-PRO"), BOARD_9XRPRO); firmware = new OpenTxFirmware("opentx-9xrpro", Firmware::tr("Turnigy 9XR-PRO"), BOARD_9XRPRO);
addOpenTxArm9xOptions(firmware, false); addOpenTxArm9xOptions(firmware, false);

3
companion/src/firmwares/rawswitch.cpp
View file

@ -115,6 +115,9 @@ QString RawSwitch::toString(Board::Type board, const GeneralSettings * const gen
case SWITCH_TYPE_ONE: case SWITCH_TYPE_ONE:
return tr("One"); return tr("One");
case SWITCH_TYPE_ACT:
return tr("Act");
case SWITCH_TYPE_FLIGHT_MODE: case SWITCH_TYPE_FLIGHT_MODE:
if (modelData) if (modelData)
return modelData->flightModeData[index-1].nameToString(index - 1); return modelData->flightModeData[index-1].nameToString(index - 1);

1
companion/src/firmwares/rawswitch.h
View file

@ -45,6 +45,7 @@ enum RawSwitchType {
SWITCH_TYPE_TIMER_MODE, SWITCH_TYPE_TIMER_MODE,
SWITCH_TYPE_TELEMETRY, SWITCH_TYPE_TELEMETRY,
SWITCH_TYPE_SENSOR, SWITCH_TYPE_SENSOR,
SWITCH_TYPE_ACT,
MAX_SWITCH_TYPE MAX_SWITCH_TYPE
}; };

22
companion/src/firmwares/sensordata.cpp
View file

@ -92,24 +92,16 @@ QString SensorData::nameToString(int index) const
return RadioData::getElementName(tr("TELE"), index + 1, label); return RadioData::getElementName(tr("TELE"), index + 1, label);
} }
QString SensorData::getRxOrModName(const ModelData* model) const QString SensorData::getOrigin(const ModelData * model) const
{ {
if ((type != TELEM_TYPE_CUSTOM) || (!id && !instance)) if (type != TELEM_TYPE_CUSTOM || !id)
return QString(); return QString();
const ModuleData& module = model->moduleData[moduleIdx]; const ModuleData & module = model->moduleData[moduleIdx];
if (module.isPxx2Module() && rxIdx <= 2 && module.access.receivers & (1 << rxIdx)) {
if (module.isPxx2Module()) { return QString(module.access.receiverName[rxIdx]);
if (module.access.receivers & (1 << rxIdx)) { }
return QString(module.access.receiverName[rxIdx]); else {
}
// receiver does not seem to be active
return QString(); return QString();
} }
if (moduleIdx)
return tr("Internal");
return tr("External");
} }

2
companion/src/firmwares/sensordata.h
View file

@ -148,7 +148,7 @@ class SensorData {
void updateUnit(); void updateUnit();
QString unitString() const; QString unitString() const;
QString nameToString(int index) const; QString nameToString(int index) const;
QString getRxOrModName(const ModelData* model) const; QString getOrigin(const ModelData* model) const;
void clear() { memset(this, 0, sizeof(SensorData)); } void clear() { memset(this, 0, sizeof(SensorData)); }
}; };

14
companion/src/generaledit/hardware.cpp
View file

@ -200,6 +200,15 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
} }
else { else {
ui->filterEnable->hide(); ui->filterEnable->hide();
ui->filterLabel->hide();
}
if (IS_STM32(board)) {
ui->rtcCheckDisable->setChecked(!generalSettings.rtcCheckDisable);
}
else {
ui->rtcCheckDisable->hide();
ui->rtcCheckLabel->hide();
} }
disableMouseScrolling(); disableMouseScrolling();
@ -217,6 +226,11 @@ void HardwarePanel::on_filterEnable_stateChanged()
generalSettings.jitterFilter = !ui->filterEnable->isChecked(); generalSettings.jitterFilter = !ui->filterEnable->isChecked();
} }
void HardwarePanel::on_rtcCheckDisable_stateChanged()
{
generalSettings.rtcCheckDisable = !ui->rtcCheckDisable->isChecked();
}
void HardwarePanel::on_PPM_MultiplierDSB_editingFinished() void HardwarePanel::on_PPM_MultiplierDSB_editingFinished()
{ {
int val = (int)(ui->PPM_MultiplierDSB->value()*10)-10; int val = (int)(ui->PPM_MultiplierDSB->value()*10)-10;

1
companion/src/generaledit/hardware.h
View file

@ -49,6 +49,7 @@ class HardwarePanel : public GeneralPanel
void on_txCurrentCalibration_editingFinished(); void on_txCurrentCalibration_editingFinished();
void on_txVoltageCalibration_editingFinished(); void on_txVoltageCalibration_editingFinished();
void on_filterEnable_stateChanged(); void on_filterEnable_stateChanged();
void on_rtcCheckDisable_stateChanged();
void on_serialPortMode_currentIndexChanged(int index); void on_serialPortMode_currentIndexChanged(int index);

284
companion/src/generaledit/hardware.ui
View file

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>470</width> <width>470</width>
<height>1585</height> <height>1618</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -57,7 +57,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="43" column="1"> <item row="44" column="1">
<widget class="QSpinBox" name="PPM2"> <widget class="QSpinBox" name="PPM2">
<property name="toolTip"> <property name="toolTip">
<string/> <string/>
@ -169,7 +169,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="39" column="1"> <item row="40" column="1">
<widget class="QSpinBox" name="txCurrentCalibration"> <widget class="QSpinBox" name="txCurrentCalibration">
<property name="minimum"> <property name="minimum">
<number>-49</number> <number>-49</number>
@ -192,27 +192,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="0"> <item row="45" column="1">
<widget class="QLabel" name="rs2Label">
<property name="text">
<string>RS2</string>
</property>
</widget>
</item>
<item row="40" column="0" colspan="3">
<widget class="Line" name="ppmSeparator">
<property name="minimumSize">
<size>
<width>0</width>
<height>10</height>
</size>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="44" column="1">
<widget class="QSpinBox" name="PPM3"> <widget class="QSpinBox" name="PPM3">
<property name="toolTip"> <property name="toolTip">
<string/> <string/>
@ -231,6 +211,26 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="41" column="0" colspan="3">
<widget class="Line" name="ppmSeparator">
<property name="minimumSize">
<size>
<width>0</width>
<height>10</height>
</size>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="12" column="0">
<widget class="QLabel" name="rs2Label">
<property name="text">
<string>RS2</string>
</property>
</widget>
</item>
<item row="13" column="0" colspan="3"> <item row="13" column="0" colspan="3">
<widget class="Line" name="potsTypeSeparator_1"> <widget class="Line" name="potsTypeSeparator_1">
<property name="minimumSize"> <property name="minimumSize">
@ -267,7 +267,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="39" column="0"> <item row="40" column="0">
<widget class="QLabel" name="txCurrentCalibrationLabel"> <widget class="QLabel" name="txCurrentCalibrationLabel">
<property name="text"> <property name="text">
<string>Current Offset</string> <string>Current Offset</string>
@ -284,7 +284,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="43" column="0"> <item row="44" column="0">
<widget class="QLabel" name="label_33"> <widget class="QLabel" name="label_33">
<property name="text"> <property name="text">
<string>PPM 2</string> <string>PPM 2</string>
@ -312,6 +312,9 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="34" column="1">
<widget class="AutoComboBox" name="antennaMode"/>
</item>
<item row="19" column="1"> <item row="19" column="1">
<widget class="AutoLineEdit" name="sfName"> <widget class="AutoLineEdit" name="sfName">
<property name="maxLength"> <property name="maxLength">
@ -322,6 +325,19 @@
<item row="8" column="2"> <item row="8" column="2">
<widget class="AutoComboBox" name="pot5Type"/> <widget class="AutoComboBox" name="pot5Type"/>
</item> </item>
<item row="20" column="2">
<widget class="AutoComboBox" name="sgType">
<property name="toolTip">
<string/>
</property>
<property name="statusTip">
<string/>
</property>
<property name="whatsThis">
<string/>
</property>
</widget>
</item>
<item row="21" column="2"> <item row="21" column="2">
<widget class="AutoComboBox" name="shType"> <widget class="AutoComboBox" name="shType">
<property name="toolTip"> <property name="toolTip">
@ -342,17 +358,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="20" column="2"> <item row="14" column="2">
<widget class="AutoComboBox" name="sgType"> <widget class="AutoComboBox" name="saType">
<property name="toolTip"> <property name="toolTip">
<string/> <string/>
</property> </property>
<property name="statusTip"> <property name="statusTip">
<string/> <string/>
</property> </property>
<property name="whatsThis">
<string/>
</property>
</widget> </widget>
</item> </item>
<item row="18" column="2"> <item row="18" column="2">
@ -375,16 +388,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="2">
<widget class="AutoComboBox" name="saType">
<property name="toolTip">
<string/>
</property>
<property name="statusTip">
<string/>
</property>
</widget>
</item>
<item row="14" column="0"> <item row="14" column="0">
<widget class="QLabel" name="saLabel"> <widget class="QLabel" name="saLabel">
<property name="text"> <property name="text">
@ -434,6 +437,16 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="2">
<widget class="AutoComboBox" name="pot2Type">
<property name="toolTip">
<string/>
</property>
<property name="statusTip">
<string/>
</property>
</widget>
</item>
<item row="29" column="2"> <item row="29" column="2">
<widget class="AutoComboBox" name="spType"> <widget class="AutoComboBox" name="spType">
<property name="toolTip"> <property name="toolTip">
@ -447,23 +460,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="1">
<widget class="AutoLineEdit" name="rsName">
<property name="maxLength">
<number>3</number>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="AutoComboBox" name="pot2Type">
<property name="toolTip">
<string/>
</property>
<property name="statusTip">
<string/>
</property>
</widget>
</item>
<item row="35" column="1"> <item row="35" column="1">
<widget class="QCheckBox" name="filterEnable"> <widget class="QCheckBox" name="filterEnable">
<property name="text"> <property name="text">
@ -471,6 +467,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="1">
<widget class="AutoLineEdit" name="rsName">
<property name="maxLength">
<number>3</number>
</property>
</widget>
</item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="AutoLineEdit" name="rudName"> <widget class="AutoLineEdit" name="rudName">
<property name="maxLength"> <property name="maxLength">
@ -512,7 +515,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="46" column="1"> <item row="47" column="1">
<widget class="QDoubleSpinBox" name="PPM_MultiplierDSB"> <widget class="QDoubleSpinBox" name="PPM_MultiplierDSB">
<property name="decimals"> <property name="decimals">
<number>1</number> <number>1</number>
@ -545,6 +548,19 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="31" column="2">
<widget class="AutoComboBox" name="srType">
<property name="toolTip">
<string/>
</property>
<property name="statusTip">
<string/>
</property>
<property name="whatsThis">
<string/>
</property>
</widget>
</item>
<item row="38" column="0"> <item row="38" column="0">
<widget class="QLabel" name="txVoltageCalibrationLabel"> <widget class="QLabel" name="txVoltageCalibrationLabel">
<property name="text"> <property name="text">
@ -562,19 +578,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="31" column="2">
<widget class="AutoComboBox" name="srType">
<property name="toolTip">
<string/>
</property>
<property name="statusTip">
<string/>
</property>
<property name="whatsThis">
<string/>
</property>
</widget>
</item>
<item row="20" column="0"> <item row="20" column="0">
<widget class="QLabel" name="sgLabel"> <widget class="QLabel" name="sgLabel">
<property name="text"> <property name="text">
@ -589,9 +592,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="34" column="1">
<widget class="AutoComboBox" name="antennaMode"/>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="eleLabel"> <widget class="QLabel" name="eleLabel">
<property name="text"> <property name="text">
@ -599,6 +599,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="22" column="0">
<widget class="QLabel" name="siLabel">
<property name="text">
<string>SI</string>
</property>
</widget>
</item>
<item row="7" column="1"> <item row="7" column="1">
<widget class="AutoLineEdit" name="pot4Name"> <widget class="AutoLineEdit" name="pot4Name">
<property name="maxLength"> <property name="maxLength">
@ -613,10 +620,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="22" column="0"> <item row="25" column="0">
<widget class="QLabel" name="siLabel"> <widget class="QLabel" name="slLabel">
<property name="text"> <property name="text">
<string>SI</string> <string>SL</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -627,13 +634,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="25" column="0">
<widget class="QLabel" name="slLabel">
<property name="text">
<string>SL</string>
</property>
</widget>
</item>
<item row="27" column="1"> <item row="27" column="1">
<widget class="AutoLineEdit" name="snName"> <widget class="AutoLineEdit" name="snName">
<property name="maxLength"> <property name="maxLength">
@ -688,7 +688,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="45" column="1"> <item row="46" column="1">
<widget class="QSpinBox" name="PPM4"> <widget class="QSpinBox" name="PPM4">
<property name="toolTip"> <property name="toolTip">
<string/> <string/>
@ -707,7 +707,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="41" column="0"> <item row="42" column="0">
<widget class="QLabel" name="label_23"> <widget class="QLabel" name="label_23">
<property name="text"> <property name="text">
<string>PPM 1</string> <string>PPM 1</string>
@ -727,14 +727,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="45" column="0"> <item row="46" column="0">
<widget class="QLabel" name="label_35"> <widget class="QLabel" name="label_35">
<property name="text"> <property name="text">
<string>PPM 4</string> <string>PPM 4</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="41" column="1"> <item row="42" column="1">
<widget class="QSpinBox" name="PPM1"> <widget class="QSpinBox" name="PPM1">
<property name="toolTip"> <property name="toolTip">
<string/> <string/>
@ -766,6 +766,20 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="15" column="0">
<widget class="QLabel" name="sbLabel">
<property name="text">
<string>SB</string>
</property>
</widget>
</item>
<item row="31" column="1">
<widget class="AutoLineEdit" name="srName">
<property name="maxLength">
<number>3</number>
</property>
</widget>
</item>
<item row="38" column="1"> <item row="38" column="1">
<widget class="QDoubleSpinBox" name="txVoltageCalibration"> <widget class="QDoubleSpinBox" name="txVoltageCalibration">
<property name="statusTip"> <property name="statusTip">
@ -788,21 +802,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="15" column="0"> <item row="47" column="0">
<widget class="QLabel" name="sbLabel">
<property name="text">
<string>SB</string>
</property>
</widget>
</item>
<item row="31" column="1">
<widget class="AutoLineEdit" name="srName">
<property name="maxLength">
<number>3</number>
</property>
</widget>
</item>
<item row="46" column="0">
<widget class="QLabel" name="label_30"> <widget class="QLabel" name="label_30">
<property name="text"> <property name="text">
<string>PPM Multiplier</string> <string>PPM Multiplier</string>
@ -903,16 +903,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="34" column="0">
<widget class="QLabel" name="antennaLabel">
<property name="text">
<string>Antenna</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="27" column="2"> <item row="27" column="2">
<widget class="AutoComboBox" name="snType"> <widget class="AutoComboBox" name="snType">
<property name="toolTip"> <property name="toolTip">
@ -933,7 +923,17 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="44" column="0"> <item row="34" column="0">
<widget class="QLabel" name="antennaLabel">
<property name="text">
<string>Antenna</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="45" column="0">
<widget class="QLabel" name="label_34"> <widget class="QLabel" name="label_34">
<property name="text"> <property name="text">
<string>PPM 3</string> <string>PPM 3</string>
@ -1029,6 +1029,26 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1">
<widget class="AutoLineEdit" name="eleName">
<property name="maxLength">
<number>3</number>
</property>
</widget>
</item>
<item row="26" column="2">
<widget class="AutoComboBox" name="smType">
<property name="toolTip">
<string/>
</property>
<property name="statusTip">
<string/>
</property>
<property name="whatsThis">
<string/>
</property>
</widget>
</item>
<item row="36" column="1"> <item row="36" column="1">
<widget class="QComboBox" name="serialPortMode"> <widget class="QComboBox" name="serialPortMode">
<item> <item>
@ -1058,26 +1078,6 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="1" column="1">
<widget class="AutoLineEdit" name="eleName">
<property name="maxLength">
<number>3</number>
</property>
</widget>
</item>
<item row="26" column="2">
<widget class="AutoComboBox" name="smType">
<property name="toolTip">
<string/>
</property>
<property name="statusTip">
<string/>
</property>
<property name="whatsThis">
<string/>
</property>
</widget>
</item>
<item row="10" column="0"> <item row="10" column="0">
<widget class="QLabel" name="rsLabel"> <widget class="QLabel" name="rsLabel">
<property name="text"> <property name="text">
@ -1113,6 +1113,20 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="39" column="1">
<widget class="QCheckBox" name="rtcCheckDisable">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="39" column="0">
<widget class="QLabel" name="rtcCheckLabel">
<property name="text">
<string>RTC Batt Check</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>

17
companion/src/helpers.cpp
View file

@ -435,6 +435,23 @@ static bool caseInsensitiveLessThan(const QString &s1, const QString &s2)
return s1.toLower() < s2.toLower(); return s1.toLower() < s2.toLower();
} }
bool displayT16ImportWarning()
{
QMessageBox msgBox;
msgBox.setWindowTitle(QObject::tr("WARNING"));
msgBox.setText(QObject::tr("<p>Importing JumperTX data into OpenTX 2.3 is <b>not supported and dangerous.</b></p> \
<p>It is unfortunately not possible for us to differentiate JumperTX data from legitimate FrSky X10 data, but <b>You should only continue here if the file you opened comes from a real FrSky X10.</b></p> \
<p>Do you really want to continue?</p>"));
msgBox.setIcon(QMessageBox::Warning);
msgBox.addButton(QMessageBox::No);
msgBox.addButton(QMessageBox::Yes);
msgBox.setDefaultButton(QMessageBox::No);
if (msgBox.exec() == QMessageBox::No)
return false;
return true;
}
void Helpers::populateFileComboBox(QComboBox * b, const QSet<QString> & set, const QString & current) void Helpers::populateFileComboBox(QComboBox * b, const QSet<QString> & set, const QString & current)
{ {
b->clear(); b->clear();

2
companion/src/helpers.h
View file

@ -52,6 +52,8 @@ extern const QColor colors[CPN_MAX_CURVES];
#define TRIM_MODE_NONE 0x1F // 0b11111 #define TRIM_MODE_NONE 0x1F // 0b11111
bool displayT16ImportWarning();
class CompanionIcon: public QIcon { class CompanionIcon: public QIcon {
public: public:
CompanionIcon(const QString &baseimage); CompanionIcon(const QString &baseimage);

2594
companion/src/images/simulator/JumperT16/JumperT16.svg Normal file
View file

File diff suppressed because it is too large Load diff
Side by side

After

Width:  |  Height:  |  Size: 104 KiB

BIN
companion/src/images/simulator/JumperT16/bottom.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 250 B

BIN
companion/src/images/simulator/JumperT16/left.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
companion/src/images/simulator/JumperT16/left_mdl.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
companion/src/images/simulator/JumperT16/left_page.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
companion/src/images/simulator/JumperT16/left_scrnsht.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
companion/src/images/simulator/JumperT16/left_sys.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
companion/src/images/simulator/JumperT16/left_tele.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
companion/src/images/simulator/JumperT16/right.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
companion/src/images/simulator/JumperT16/right_ent.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
companion/src/images/simulator/JumperT16/right_rtn.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
companion/src/images/simulator/JumperT16/top.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 439 B

28
companion/src/images/simulator/X9D2019/Readme.md Normal file
View file

@ -0,0 +1,28 @@
# "Taranis X9D+ 2019" dark blue skin for the Companion simulator
![X9D+ 2019 Image for Companion](X9DP2019_Companion_image.png "Taranis X9D+ 2019")
## The different parts of the image
The image is divided into 4 pieces: top, bottom, left and right.
For the images concerned, there is the version with the activated element and the version without the activated element (such as a button, a rotary encoder, clicking on the rotary encoder).
| File name | What is this image ? |
|:---------------------|:----------------------------------------------|
| `bottom.png` | central lower band |
| `center_LCD.png` | central LCD 424x128px (useless for simulator) |
| `left.png` | left part with inactive elements |
| `left_exit.png` | left part with the EXIT button activated |
| `left_menu.png` | left part with the MENU button activated |
| `left_page.png` | left part with the PAGE button activated |
| `bottom_scrnshot.png`| central lower band with the SCREENSHOT button activated|
| `right_ent.png` | right part with the ENTER button activated |
| `right.png` | right part with inactive elements |
| `top.png` | central upper band |
`X9DP2019_Companion_image.png` is the image displayed here.
## Software used :
- **Inkscape** : vector drawing software (http://www.inkscape.org/)
- **Gimp** : image editor (http://www.gimp.org/)

BIN
companion/src/images/simulator/X9D2019/X9DP2019_Companion_image.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 52 KiB

BIN
companion/src/images/simulator/X9D2019/bottom.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
companion/src/images/simulator/X9D2019/bottom_scrnshot.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
companion/src/images/simulator/X9D2019/center_LCD.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 557 B

BIN
companion/src/images/simulator/X9D2019/left.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
companion/src/images/simulator/X9D2019/left_exit.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
companion/src/images/simulator/X9D2019/left_menu.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
companion/src/images/simulator/X9D2019/left_page.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
companion/src/images/simulator/X9D2019/right.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
companion/src/images/simulator/X9D2019/right_enter.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
companion/src/images/simulator/X9D2019/top.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8 KiB

29
companion/src/images/simulator/X9LITE/Readme.md Normal file
View file

@ -0,0 +1,29 @@
# X9-Lite skin for the Companion simulator
![X9-Lite Image for Companion](X9-Lite_Companion_image.png "X9-Lite")
## The different parts of the image
The image is divided into 4 pieces: top, bottom, left and right.
For the images concerned, there is the version with the activated element and the version without the activated element (such as a button, a rotary encoder, clicking on the rotary encoder).
| File name | What is this image ? |
|:---------------------|:----------------------------------------------|
| `bottom.png` | central lower band |
| `center_LCD.png` | central LCD 256x128px (useless for simulator) |
| `left.png` | left part with inactive elements |
| `left_exit.png` | left part with the EXIT button activated |
| `left_menu.png` | left part with the MENU button activated |
| `left_page.png` | left part with the PAGE button activated |
| `left_scrnshot.png `| left part with the SCREENSHOT button activated|
| `right_ent.png` | right part with the ENT button activated |
| `right_rotcoder.png` | right part with the Rotary Encoder actuated |
| `right.png` | right part with inactive elements |
| `top.png` | central upper band |
`X9-Lite_Companion_image.png` is the image displayed here.
When turning the rotary encoder, it is possible to make a motion effect by displaying `right_rotcoder.png` and `right.png`.
## Software used :
- **Inkscape** : vector drawing software (http://www.inkscape.org/)
- **Gimp** : image editor (http://www.gimp.org/)

BIN
companion/src/images/simulator/X9LITE/X9-Lite_Companion_image.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 41 KiB

BIN
companion/src/images/simulator/X9LITE/bottom.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 252 B

After

Width:  |  Height:  |  Size: 4.5 KiB

Before After
Before After

BIN
companion/src/images/simulator/X9LITE/center_LCD.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 472 B

BIN
companion/src/images/simulator/X9LITE/left.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

BIN
companion/src/images/simulator/X9LITE/left_exit.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

BIN
companion/src/images/simulator/X9LITE/left_menu.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

BIN
companion/src/images/simulator/X9LITE/left_page.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

BIN
companion/src/images/simulator/X9LITE/left_scrnshot.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

BIN
companion/src/images/simulator/X9LITE/right.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

Before After
Before After

BIN
companion/src/images/simulator/X9LITE/right_ent.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before After
Before After

BIN
companion/src/images/simulator/X9LITE/right_rotary_encoder.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.7 KiB

BIN
companion/src/images/simulator/X9LITE/top.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Before After
Before After

6
companion/src/mdichild.cpp
View file

@ -1457,6 +1457,12 @@ bool MdiChild::convertStorage(Board::Type from, Board::Type to, bool newFile)
{ {
QMessageBox::StandardButtons btns; QMessageBox::StandardButtons btns;
QMessageBox::StandardButton dfltBtn; QMessageBox::StandardButton dfltBtn;
if (from == Board::BOARD_X10 && to == Board::BOARD_JUMPER_T16) {
if (displayT16ImportWarning() == false)
return false;
}
QString q = tr("<p><b>Currently selected radio type (%1) is not compatible with file %3 (from %2), models and settings need to be converted.</b></p>").arg(Boards::getBoardName(to)).arg(Boards::getBoardName(from)).arg(userFriendlyCurrentFile()); QString q = tr("<p><b>Currently selected radio type (%1) is not compatible with file %3 (from %2), models and settings need to be converted.</b></p>").arg(Boards::getBoardName(to)).arg(Boards::getBoardName(from)).arg(userFriendlyCurrentFile());
if (newFile) { if (newFile) {
q.append(tr("Do you wish to continue with the conversion?")); q.append(tr("Do you wish to continue with the conversion?"));

2
companion/src/modeledit/customfunctions.cpp
View file

@ -688,7 +688,7 @@ void CustomFunctionsPanel::populateFuncCB(QComboBox *b, unsigned int value)
((i==FuncLogs) && !firmware->getCapability(HasSDLogs)) || ((i==FuncLogs) && !firmware->getCapability(HasSDLogs)) ||
((i==FuncSetTimer1 || i==FuncSetTimer2) && !IS_ARM(firmware->getBoard())) || ((i==FuncSetTimer1 || i==FuncSetTimer2) && !IS_ARM(firmware->getBoard())) ||
((i==FuncSetTimer3) && firmware->getCapability(Timers) < 3) || ((i==FuncSetTimer3) && firmware->getCapability(Timers) < 3) ||
((i==FuncScreenshot) && !IS_TARANIS(firmware->getBoard())) || ((i==FuncScreenshot) && !IS_HORUS_OR_TARANIS(firmware->getBoard())) ||
((i>=FuncRangeCheckInternalModule && i<=FuncBindExternalModule) && (!model || !firmware->getCapability(DangerousFunctions))) || ((i>=FuncRangeCheckInternalModule && i<=FuncBindExternalModule) && (!model || !firmware->getCapability(DangerousFunctions))) ||
((i>=FuncAdjustGV1 && i<=FuncAdjustGVLast) && (!model || !firmware->getCapability(Gvars))) ((i>=FuncAdjustGV1 && i<=FuncAdjustGVLast) && (!model || !firmware->getCapability(Gvars)))
) { ) {

71
companion/src/modeledit/setup.cpp
View file

@ -217,15 +217,14 @@ ModulePanel::ModulePanel(QWidget * parent, ModelData & model, ModuleData & modul
// The protocols available on this board // The protocols available on this board
for (unsigned int i=0; i<PULSES_PROTOCOL_LAST; i++) { for (unsigned int i=0; i<PULSES_PROTOCOL_LAST; i++) {
if (firmware->isAvailable((PulsesProtocol) i, moduleIdx)) { if (firmware->isAvailable((PulsesProtocol) i, moduleIdx)) {
if (IS_TARANIS_XLITE(firmware->getBoard()) && i == PULSES_PXX_R9M) //TODO remove when mini are handled as a different module type ui->protocol->addItem(ModuleData::protocolToString(i), i);
ui->protocol->addItem("FrSky R9M Mini", (QVariant) i);
else
ui->protocol->addItem(ModuleData::protocolToString(i), i);
if (i == module.protocol) if (i == module.protocol)
ui->protocol->setCurrentIndex(ui->protocol->count()-1); ui->protocol->setCurrentIndex(ui->protocol->count()-1);
} }
} }
for (int i=0; i<=MODULE_SUBTYPE_MULTI_LAST; i++) { for (int i=0; i<=MODULE_SUBTYPE_MULTI_LAST; i++) {
if (i == MODULE_SUBTYPE_MULTI_SCANNER)
continue;
ui->multiProtocol->addItem(Multiprotocols::protocolToString(i), i); ui->multiProtocol->addItem(Multiprotocols::protocolToString(i), i);
} }
@ -299,8 +298,10 @@ void ModulePanel::setupFailsafes()
} }
} }
if (!hasFailsafe) if (!hasFailsafe) {
lock = false;
return; return;
}
int row = 0; int row = 0;
int col = 0; int col = 0;
@ -365,6 +366,48 @@ void ModulePanel::setupFailsafes()
lock = false; lock = false;
} }
int ModulePanel::getMaxChannelCount()
{
const PulsesProtocol protocol = (PulsesProtocol)module.protocol;
switch (protocol) {
case PULSES_ACCESS_ISRM:
return 24;
case PULSES_PXX_R9M:
case PULSES_ACCESS_R9M:
case PULSES_ACCESS_R9M_LITE:
case PULSES_ACCESS_R9M_LITE_PRO:
case PULSES_ACCST_ISRM_D16:
case PULSES_XJT_LITE_X16:
case PULSES_PXX_XJT_X16:
case PULSES_CROSSFIRE:
case PULSES_SBUS:
return 16;
case PULSES_XJT_LITE_LR12:
case PULSES_PXX_XJT_LR12:
return 12;
case PULSES_PXX_DJT:
case PULSES_XJT_LITE_D8:
case PULSES_PXX_XJT_D8:
case PULSES_PPM:
return 8;
case PULSES_LP45:
case PULSES_DSM2:
case PULSES_DSMX:
return 6;
case PULSES_MULTIMODULE:
if (module.multi.rfProtocol == MODULE_SUBTYPE_MULTI_DSM2)
return 12;
else
return 16;
break;
case PULSES_OFF:
break;
default:
break;
}
return 8;
}
void ModulePanel::update() void ModulePanel::update()
{ {
const PulsesProtocol protocol = (PulsesProtocol)module.protocol; const PulsesProtocol protocol = (PulsesProtocol)module.protocol;
@ -463,10 +506,12 @@ void ModulePanel::update()
ui->rxNumber->setValue(module.modelId); ui->rxNumber->setValue(module.modelId);
ui->label_channelsStart->setVisible(mask & MASK_CHANNELS_RANGE); ui->label_channelsStart->setVisible(mask & MASK_CHANNELS_RANGE);
ui->channelsStart->setVisible(mask & MASK_CHANNELS_RANGE); ui->channelsStart->setVisible(mask & MASK_CHANNELS_RANGE);
ui->channelsStart->setMaximum(33 - module.channelsCount);
ui->channelsStart->setValue(module.channelsStart+1); ui->channelsStart->setValue(module.channelsStart+1);
ui->label_channelsCount->setVisible(mask & MASK_CHANNELS_RANGE); ui->label_channelsCount->setVisible(mask & MASK_CHANNELS_RANGE);
ui->channelsCount->setVisible(mask & MASK_CHANNELS_RANGE); ui->channelsCount->setVisible(mask & MASK_CHANNELS_RANGE);
ui->channelsCount->setEnabled(mask & MASK_CHANNELS_COUNT); ui->channelsCount->setEnabled(mask & MASK_CHANNELS_COUNT);
ui->channelsCount->setMaximum(getMaxChannelCount());
ui->channelsCount->setValue(module.channelsCount); ui->channelsCount->setValue(module.channelsCount);
ui->channelsCount->setSingleStep(firmware->getCapability(HasPPMStart) ? 1 : 2); ui->channelsCount->setSingleStep(firmware->getCapability(HasPPMStart) ? 1 : 2);
@ -482,7 +527,7 @@ void ModulePanel::update()
ui->ppmDelay->setValue(module.ppm.delay); ui->ppmDelay->setValue(module.ppm.delay);
ui->label_ppmFrameLength->setVisible(mask & MASK_SBUSPPM_FIELDS); ui->label_ppmFrameLength->setVisible(mask & MASK_SBUSPPM_FIELDS);
ui->ppmFrameLength->setVisible(mask & MASK_SBUSPPM_FIELDS); ui->ppmFrameLength->setVisible(mask & MASK_SBUSPPM_FIELDS);
ui->ppmFrameLength->setMinimum(module.channelsCount*(model->extendedLimits ? 2.250 : 2)+3.5); ui->ppmFrameLength->setMinimum(module.channelsCount * (model->extendedLimits ? 2.250 : 2)+3.5);
ui->ppmFrameLength->setMaximum(firmware->getCapability(PPMFrameLength)); ui->ppmFrameLength->setMaximum(firmware->getCapability(PPMFrameLength));
ui->ppmFrameLength->setValue(22.5+((double)module.ppm.frameLength)*0.5); ui->ppmFrameLength->setValue(22.5+((double)module.ppm.frameLength)*0.5);
@ -546,7 +591,7 @@ void ModulePanel::update()
ui->lowPower->setVisible(mask & MASK_MULTIMODULE); ui->lowPower->setVisible(mask & MASK_MULTIMODULE);
if (mask & MASK_MULTIMODULE) { if (mask & MASK_MULTIMODULE) {
ui->multiProtocol->setCurrentIndex(module.multi.rfProtocol); ui->multiProtocol->setCurrentIndex(ui->multiProtocol->findData(module.multi.rfProtocol));
ui->autoBind->setChecked(module.multi.autoBindMode); ui->autoBind->setChecked(module.multi.autoBindMode);
ui->lowPower->setChecked(module.multi.lowPowerMode); ui->lowPower->setChecked(module.multi.lowPowerMode);
} }
@ -611,11 +656,6 @@ void ModulePanel::update()
} }
} }
} }
if (mask & MASK_CHANNELS_RANGE) {
ui->channelsStart->setMaximum(33 - ui->channelsCount->value());
ui->channelsCount->setMaximum(qMin(24, 33-ui->channelsStart->value()));
}
} }
void ModulePanel::on_trainerMode_currentIndexChanged(int index) void ModulePanel::on_trainerMode_currentIndexChanged(int index)
@ -631,6 +671,7 @@ void ModulePanel::onProtocolChanged(int index)
{ {
if (!lock && module.protocol != ui->protocol->itemData(index).toUInt()) { if (!lock && module.protocol != ui->protocol->itemData(index).toUInt()) {
module.protocol = ui->protocol->itemData(index).toInt(); module.protocol = ui->protocol->itemData(index).toInt();
module.channelsCount = getMaxChannelCount();
update(); update();
emit modified(); emit modified();
} }
@ -717,13 +758,15 @@ void ModulePanel::on_failsafeMode_currentIndexChanged(int value)
void ModulePanel::onMultiProtocolChanged(int index) void ModulePanel::onMultiProtocolChanged(int index)
{ {
if (!lock && module.multi.rfProtocol != (unsigned)index) { int rfProtocol = ui->multiProtocol->itemData(index).toInt();
if (!lock && module.multi.rfProtocol != (unsigned)rfProtocol) {
lock=true; lock=true;
module.multi.rfProtocol = (unsigned int) index; module.multi.rfProtocol = (unsigned int)rfProtocol;
unsigned int maxSubTypes = multiProtocols.getProtocol(index).numSubTypes(); unsigned int maxSubTypes = multiProtocols.getProtocol(index).numSubTypes();
if (module.multi.customProto) if (module.multi.customProto)
maxSubTypes=8; maxSubTypes=8;
module.subType = std::min(module.subType, maxSubTypes -1); module.subType = std::min(module.subType, maxSubTypes -1);
module.channelsCount = getMaxChannelCount();
update(); update();
emit modified(); emit modified();
lock = false; lock = false;

1
companion/src/modeledit/setup.h
View file

@ -71,6 +71,7 @@ class ModulePanel : public ModelPanel
void channelsRangeChanged(); void channelsRangeChanged();
private slots: private slots:
int getMaxChannelCount();
void setupFailsafes(); void setupFailsafes();
void on_trainerMode_currentIndexChanged(int index); void on_trainerMode_currentIndexChanged(int index);
void onProtocolChanged(int index); void onProtocolChanged(int index);

20
companion/src/modeledit/telemetry.cpp
View file

@ -653,9 +653,8 @@ void TelemetrySensorPanel::update()
ui->id->hide(); ui->id->hide();
ui->instanceLabel->hide(); ui->instanceLabel->hide();
ui->instance->hide(); ui->instance->hide();
ui->rxLabel->hide(); ui->originLabel->hide();
ui->moduleLabel->hide(); ui->origin->hide();
ui->rxOrMod->hide();
ui->formula->show(); ui->formula->show();
ui->formula->setCurrentIndex(sensor.formula); ui->formula->setCurrentIndex(sensor.formula);
isConfigurable = (sensor.formula < SensorData::TELEM_FORMULA_CELL); isConfigurable = (sensor.formula < SensorData::TELEM_FORMULA_CELL);
@ -679,13 +678,10 @@ void TelemetrySensorPanel::update()
ui->id->show(); ui->id->show();
ui->instanceLabel->show(); ui->instanceLabel->show();
ui->instance->show(); ui->instance->show();
QString origin = sensor.getOrigin(model);
bool is_pxx2 = model->moduleData[sensor.moduleIdx].isPxx2Module(); ui->originLabel->setVisible(!origin.isEmpty());
ui->rxLabel->setVisible(is_pxx2); ui->origin->setVisible(!origin.isEmpty());
ui->moduleLabel->setVisible(!is_pxx2); ui->origin->setText(origin);
ui->rxOrMod->setText(sensor.getRxOrModName(model));
ui->rxOrMod->show();
ui->formula->hide(); ui->formula->hide();
isConfigurable = sensor.unit < SensorData::UNIT_FIRST_VIRTUAL; isConfigurable = sensor.unit < SensorData::UNIT_FIRST_VIRTUAL;
@ -755,7 +751,7 @@ void populateTelemetrySourcesComboBox(AutoComboBox * cb, const ModelData * model
const SensorData& sensor = model->sensorData[-i-1]; const SensorData& sensor = model->sensorData[-i-1];
if (sensor.isAvailable()) { if (sensor.isAvailable()) {
if (sensor.type == SensorData::TELEM_TYPE_CUSTOM) if (sensor.type == SensorData::TELEM_TYPE_CUSTOM)
cb->addItem(QString("-%1 (%2)").arg(sensor.label, sensor.getRxOrModName(model)), i); cb->addItem(QString("-%1 (%2)").arg(sensor.label, sensor.getOrigin(model)), i);
else else
cb->addItem(QString("-%1").arg(sensor.label), i); cb->addItem(QString("-%1").arg(sensor.label), i);
} }
@ -766,7 +762,7 @@ void populateTelemetrySourcesComboBox(AutoComboBox * cb, const ModelData * model
const SensorData& sensor = model->sensorData[i-1]; const SensorData& sensor = model->sensorData[i-1];
if (sensor.isAvailable()) { if (sensor.isAvailable()) {
if (sensor.type == SensorData::TELEM_TYPE_CUSTOM) if (sensor.type == SensorData::TELEM_TYPE_CUSTOM)
cb->addItem(QString("%1 (%2)").arg(sensor.label, sensor.getRxOrModName(model)), i); cb->addItem(QString("%1 (%2)").arg(sensor.label, sensor.getOrigin(model)), i);
else else
cb->addItem(QString("%1").arg(sensor.label), i); cb->addItem(QString("%1").arg(sensor.label), i);
} }

13
companion/src/modeledit/telemetry_sensor.ui
View file

@ -13,7 +13,7 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1,0,0,0,1,0,0,0,1,1,1,0,0,1,0,1,0,1,1,1,1,1,1,0,1,0,0,1,0,0,1,0,0,0,0,0"> <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1,0,0,0,1,0,0,1,1,1,0,0,1,0,1,0,1,1,1,1,1,1,0,1,0,0,1,0,0,1,0,0,0,0,0">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
@ -121,21 +121,14 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="rxLabel"> <widget class="QLabel" name="originLabel">
<property name="text"> <property name="text">
<string>Rx</string> <string>Rx</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="moduleLabel"> <widget class="QLineEdit" name="origin">
<property name="text">
<string>Mod.</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="rxOrMod">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>

5
companion/src/modelslist.cpp
View file

@ -727,7 +727,7 @@ void TreeModel::refresh()
protocol = moduleData.protocol; protocol = moduleData.protocol;
// These are the only RXs that allow nominating RX # but changing RX or copying models can leave residual configuration which can cause issues // These are the only RXs that allow nominating RX # but changing RX or copying models can leave residual configuration which can cause issues
// if (protocol == PULSES_PXX_XJT_X16 || protocol == PULSES_PXX_XJT_LR12 || protocol == PULSES_PXX_R9M || protocol == PULSES_DSMX || protocol == PULSES_MULTIMODULE) { // if (protocol == PULSES_PXX_XJT_X16 || protocol == PULSES_PXX_XJT_LR12 || protocol == PULSES_PXX_R9M || protocol == PULSES_DSMX || protocol == PULSES_MULTIMODULE) {
if (protocol != PULSES_OFF && moduleData.modelId > 0) { if (moduleData.supportRxNum() && moduleData.modelId > 0) {
if (!rxs.isEmpty()) { if (!rxs.isEmpty()) {
rxs.append(", "); rxs.append(", ");
} }
@ -751,6 +751,9 @@ void TreeModel::refresh()
bool TreeModel::isModelIdUnique(unsigned modelIdx, unsigned module, unsigned protocol) bool TreeModel::isModelIdUnique(unsigned modelIdx, unsigned module, unsigned protocol)
{ {
int cnt = 0; int cnt = 0;
if (protocol== PULSES_PXX_XJT_D8)
return true;
for (auto const& model: radioData->models) { for (auto const& model: radioData->models) {
if (!model.isEmpty()) { if (!model.isEmpty()) {
const ModuleData& moduleData = model.moduleData[module]; const ModuleData& moduleData = model.moduleData[module];

5
companion/src/radiointerface.cpp
View file

@ -333,6 +333,11 @@ bool readEeprom(const QString & filename, ProgressWidget * progress)
QMessageBox::critical(progress, CPN_STR_TTL_ERROR, outputStorage.error()); QMessageBox::critical(progress, CPN_STR_TTL_ERROR, outputStorage.error());
return false; return false;
} }
if (getCurrentBoard() == Board::BOARD_JUMPER_T16 && inputStorage.getBoard() == Board::BOARD_X10) {
if (displayT16ImportWarning() == false)
return false;
}
} }
else { else {
if (IS_ARM(board)) { if (IS_ARM(board)) {

4
companion/src/simulation/CMakeLists.txt
View file

@ -9,9 +9,11 @@ set(simulation_SRCS
simulateduiwidgetX9.cpp simulateduiwidgetX9.cpp
simulateduiwidgetXLITE.cpp simulateduiwidgetXLITE.cpp
simulateduiwidgetX9E.cpp simulateduiwidgetX9E.cpp
simulateduiwidgetX9D2019.cpp
simulateduiwidgetX10.cpp simulateduiwidgetX10.cpp
simulateduiwidgetX12.cpp simulateduiwidgetX12.cpp
simulateduiwidgetJumperT12.cpp simulateduiwidgetJumperT12.cpp
simulateduiwidgetJumperT16.cpp
simulatorinterface.cpp simulatorinterface.cpp
simulatormainwindow.cpp simulatormainwindow.cpp
simulatorstartupdialog.cpp simulatorstartupdialog.cpp
@ -31,9 +33,11 @@ set(simulation_UIS
simulateduiwidgetX9.ui simulateduiwidgetX9.ui
simulateduiwidgetXLITE.ui simulateduiwidgetXLITE.ui
simulateduiwidgetX9E.ui simulateduiwidgetX9E.ui
simulateduiwidgetX9D2019.ui
simulateduiwidgetX10.ui simulateduiwidgetX10.ui
simulateduiwidgetX12.ui simulateduiwidgetX12.ui
simulateduiwidgetJumperT12.ui simulateduiwidgetJumperT12.ui
simulateduiwidgetJumperT16.ui
simulatormainwindow.ui simulatormainwindow.ui
simulatorstartupdialog.ui simulatorstartupdialog.ui
simulatorwidget.ui simulatorwidget.ui

27
companion/src/simulation/simulateduiwidget.h
View file

@ -108,9 +108,11 @@ namespace Ui {
class SimulatedUIWidgetX9; class SimulatedUIWidgetX9;
class SimulatedUIWidgetXLITE; class SimulatedUIWidgetXLITE;
class SimulatedUIWidgetX9E; class SimulatedUIWidgetX9E;
class SimulatedUIWidgetX9D2019;
class SimulatedUIWidgetX10; class SimulatedUIWidgetX10;
class SimulatedUIWidgetX12; class SimulatedUIWidgetX12;
class SimulatedUIWidgetJumperT12; class SimulatedUIWidgetJumperT12;
class SimulatedUIWidgetJumperT16;
} }
class SimulatedUIWidget9X: public SimulatedUIWidget class SimulatedUIWidget9X: public SimulatedUIWidget
@ -189,6 +191,18 @@ class SimulatedUIWidgetX9E: public SimulatedUIWidget
Ui::SimulatedUIWidgetX9E * ui; Ui::SimulatedUIWidgetX9E * ui;
}; };
class SimulatedUIWidgetX9D2019: public SimulatedUIWidget
{
Q_OBJECT
public:
explicit SimulatedUIWidgetX9D2019(SimulatorInterface * simulator, QWidget * parent = nullptr);
virtual ~SimulatedUIWidgetX9D2019();
private:
Ui::SimulatedUIWidgetX9D2019 * ui;
};
class SimulatedUIWidgetX10: public SimulatedUIWidget class SimulatedUIWidgetX10: public SimulatedUIWidget
{ {
Q_OBJECT Q_OBJECT
@ -225,4 +239,17 @@ class SimulatedUIWidgetJumperT12: public SimulatedUIWidget
Ui::SimulatedUIWidgetJumperT12 * ui; Ui::SimulatedUIWidgetJumperT12 * ui;
}; };
class SimulatedUIWidgetJumperT16: public SimulatedUIWidget
{
Q_OBJECT
public:
explicit SimulatedUIWidgetJumperT16(SimulatorInterface * simulator, QWidget * parent = nullptr);
virtual ~SimulatedUIWidgetJumperT16();
private:
Ui::SimulatedUIWidgetJumperT16 * ui;
};
#endif // SIMULATEDUIWIDGET_H #endif // SIMULATEDUIWIDGET_H

1
companion/src/simulation/simulateduiwidgetJumperT12.cpp
View file

@ -8,7 +8,6 @@ SimulatedUIWidgetJumperT12::SimulatedUIWidgetJumperT12(SimulatorInterface *simul
ui(new Ui::SimulatedUIWidgetJumperT12) ui(new Ui::SimulatedUIWidgetJumperT12)
{ {
RadioUiAction * act; RadioUiAction * act;
QPolygon polygon;
ui->setupUi(this); ui->setupUi(this);

69
companion/src/simulation/simulateduiwidgetJumperT16.cpp Normal file
View file

@ -0,0 +1,69 @@
/*
* Copyright (C) OpenTX
*
* Based on code named
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* 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.
*/
// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h
#include "simulateduiwidget.h"
#include "ui_simulateduiwidgetJumperT16.h"
SimulatedUIWidgetJumperT16::SimulatedUIWidgetJumperT16(SimulatorInterface *simulator, QWidget * parent):
SimulatedUIWidget(simulator, parent),
ui(new Ui::SimulatedUIWidgetJumperT16)
{
RadioUiAction * act;
ui->setupUi(this);
// add actions in order of appearance on the help menu
act = new RadioUiAction(3, QList<int>() << Qt::Key_Up, SIMU_STR_HLP_KEY_UP, SIMU_STR_HLP_ACT_MDL);
addRadioWidget(ui->leftbuttons->addArea(QRect(10, 70, 80, 35), "JumperT16/left_mdl.png", act));
act = new RadioUiAction(6, QList<int>() << Qt::Key_Left, SIMU_STR_HLP_KEY_LFT, SIMU_STR_HLP_ACT_SYS);
addRadioWidget(ui->leftbuttons->addArea(QRect(10, 10, 80, 35), "JumperT16/left_sys.png", act));
act = new RadioUiAction(5, QList<int>() << Qt::Key_Right, SIMU_STR_HLP_KEY_RGT, SIMU_STR_HLP_ACT_TELE);
addRadioWidget(ui->leftbuttons->addArea(QRect(10, 190, 80, 35), "JumperT16/left_tele.png", act));
act = new RadioUiAction(4, QList<int>() << Qt::Key_Down << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace,
SIMU_STR_HLP_KEY_DN % "<br>" % SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_RTN);
addRadioWidget(ui->rightbuttons->addArea(QRect(35, 10, 80, 35), "JumperT16/right_rtn.png", act));
act = new RadioUiAction(1, QList<int>() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN);
addRadioWidget(ui->leftbuttons->addArea(QRect(10, 131, 80, 35), "JumperT16/left_page.png", act));
m_scrollUpAction = new RadioUiAction(-1, QList<int>() << Qt::Key_Minus, SIMU_STR_HLP_KEY_MIN % "|" % SIMU_STR_HLP_MOUSE_UP, SIMU_STR_HLP_ACT_ROT_LFT);
m_scrollDnAction = new RadioUiAction(-1, QList<int>() << Qt::Key_Plus << Qt::Key_Equal, SIMU_STR_HLP_KEY_PLS % "|" % SIMU_STR_HLP_MOUSE_DN, SIMU_STR_HLP_ACT_ROT_RGT);
connectScrollActions();
m_mouseMidClickAction = new RadioUiAction(2, QList<int>() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN);
addRadioWidget(ui->rightbuttons->addArea(QRect(45, 70, 100, 160), "JumperT16/right_ent.png", m_mouseMidClickAction));
addRadioWidget(ui->leftbuttons->addArea(QRect(10, 252, 30, 30), "JumperT16/left_scrnsht.png", m_screenshotAction));
m_backlightColors << QColor(47, 123, 227);
setLcd(ui->lcd);
}
SimulatedUIWidgetJumperT16::~SimulatedUIWidgetJumperT16()
{
delete ui;
}

197
companion/src/simulation/simulateduiwidgetJumperT16.ui Normal file
View file

@ -0,0 +1,197 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SimulatedUIWidgetJumperT16</class>
<widget class="QWidget" name="SimulatedUIWidgetJumperT16">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>825</width>
<height>292</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>825</width>
<height>292</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>825</width>
<height>292</height>
</size>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>0</number>
</property>
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="2" rowspan="3">
<widget class="ButtonsWidget" name="rightbuttons" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>174</width>
<height>292</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>174</width>
<height>292</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">background:url(:/images/simulator/JumperT16/right.png)</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="LcdWidget" name="lcd" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>480</width>
<height>272</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>480</width>
<height>272</height>
</size>
</property>
<property name="font">
<font>
<pointsize>5</pointsize>
</font>
</property>
</widget>
</item>
<item row="0" column="0" rowspan="3">
<widget class="ButtonsWidget" name="leftbuttons" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>174</width>
<height>292</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>174</width>
<height>292</height>
</size>
</property>
<property name="mouseTracking">
<bool>true</bool>
</property>
<property name="styleSheet">
<string notr="true">background:url(:/images/simulator/JumperT16/left.png);</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QWidget" name="top" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>480</width>
<height>10</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>480</width>
<height>10</height>
</size>
</property>
<property name="font">
<font>
<pointsize>5</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">background:url(:/images/simulator/JumperT16/top.png)</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QWidget" name="bottom" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>480</width>
<height>10</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>480</width>
<height>10</height>
</size>
</property>
<property name="font">
<font>
<pointsize>5</pointsize>
<kerning>false</kerning>
</font>
</property>
<property name="styleSheet">
<string notr="true">background:url(:/images/simulator/JumperT16/bottom.png)</string>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>LcdWidget</class>
<extends>QWidget</extends>
<header>lcdwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>ButtonsWidget</class>
<extends>QWidget</extends>
<header>buttonswidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

83
companion/src/simulation/simulateduiwidgetX9D2019.cpp Normal file
View file

@ -0,0 +1,83 @@
/*
* Copyright (C) OpenTX
*
* Based on code named
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* 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.
*/
// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h
#include "simulateduiwidget.h"
#include "ui_simulateduiwidgetX9D2019.h"
SimulatedUIWidgetX9D2019::SimulatedUIWidgetX9D2019(SimulatorInterface *simulator, QWidget * parent):
SimulatedUIWidget(simulator, parent),
ui(new Ui::SimulatedUIWidgetX9D2019)
{
RadioUiAction * act;
ui->setupUi(this);
// add actions in order of appearance on the help menu
QPoint ctr(70, 100);
act = new RadioUiAction(0, QList<int>() << Qt::Key_Up << Qt::Key_PageUp, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_MENU);
addRadioWidget(ui->leftbuttons->addArea(QRect(25, 40, 80, 35), "X9D2019/left_menu.png", act));
act = new RadioUiAction(3, QList<int>() << Qt::Key_Down << Qt::Key_PageDown, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_PAGE);
addRadioWidget(ui->leftbuttons->addArea(QRect(25, 85, 80, 35), "X9D2019/left_page.png", act));
act = new RadioUiAction(1, QList<int>() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT);
addRadioWidget(ui->leftbuttons->addArea(QRect(25, 140, 80, 35), "X9D2019/left_exit.png", act));
m_scrollUpAction = addRadioAction(new RadioUiAction(-1, QList<int>() << Qt::Key_Minus << Qt::Key_Left, SIMU_STR_HLP_KEYS_GO_LFT, SIMU_STR_HLP_ACT_ROT_LFT));
m_scrollDnAction = addRadioAction(new RadioUiAction(-1, QList<int>() << Qt::Key_Plus << Qt::Key_Equal << Qt::Key_Right, SIMU_STR_HLP_KEYS_GO_RGT, SIMU_STR_HLP_ACT_ROT_RGT));
connectScrollActions();
m_mouseMidClickAction = new RadioUiAction(2, QList<int>() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN);
addRadioWidget(ui->rightbuttons->addArea(QRect(40, 30, 80, 130), "X9D2019/right_enter.png", m_mouseMidClickAction));
addRadioWidget(ui->leftbuttons->addArea(QRect(10, 170, 30, 30), "X9D2019/left_scrnshot.png", m_screenshotAction));
m_backlightColors << QColor(47, 123, 227); // Taranis Blue
m_backlightColors << QColor(166,247,159);
m_backlightColors << QColor(247,159,166);
m_backlightColors << QColor(255,195,151);
m_backlightColors << QColor(247,242,159);
setLcd(ui->lcd);
QString css = "#radioUiWidget {"
"background-color: qlineargradient(spread:pad, x1:1, y1:0.9, x2:0, y2:0,"
"stop:0 rgba(255, 255, 255, 255),"
"stop:0.35 rgba(250, 250, 250, 255), stop:0.5 rgba(242, 241, 241, 255),"
"stop:0.61 rgba(241, 241, 241, 255), stop:1.0 rgba(251, 251, 251, 255));"
"}";
QTimer * tim = new QTimer(this);
tim->setSingleShot(true);
connect(tim, &QTimer::timeout, [this, css]() {
emit customStyleRequest(css);
});
tim->start(100);
}
SimulatedUIWidgetX9D2019::~SimulatedUIWidgetX9D2019()
{
delete ui;
}

166
companion/src/simulation/simulateduiwidgetX9D2019.ui Normal file
View file

@ -0,0 +1,166 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SimulatedUIWidgetX9D2019</class>
<widget class="QWidget" name="SimulatedUIWidgetX9D2019">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>756</width>
<height>258</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>756</width>
<height>258</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>756</width>
<height>258</height>
</size>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="0" rowspan="3">
<widget class="ButtonsWidget" name="leftbuttons" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>166</width>
<height>258</height>
</size>
</property>
<property name="mouseTracking">
<bool>true</bool>
</property>
<property name="styleSheet">
<string notr="true">background:url(:/images/simulator/X9D2019/left.png);</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QWidget" name="top" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>424</width>
<height>50</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">background:url(:/images/simulator/X9D2019/top.png)</string>
</property>
</widget>
</item>
<item row="0" column="2" rowspan="3">
<widget class="ButtonsWidget" name="rightbuttons" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>166</width>
<height>258</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">background:url(:/images/simulator/X9D2019/right.png)</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="LcdWidget" name="lcd" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>424</width>
<height>128</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>424</width>
<height>128</height>
</size>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QWidget" name="bottom" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>424</width>
<height>80</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">background:url(:/images/simulator/X9D2019/bottom.png)</string>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>LcdWidget</class>
<extends>QWidget</extends>
<header>lcdwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>ButtonsWidget</class>
<extends>QWidget</extends>
<header>buttonswidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

21
companion/src/simulation/simulateduiwidgetX9LITE.cpp
View file

@ -8,24 +8,21 @@ SimulatedUIWidgetX9LITE::SimulatedUIWidgetX9LITE(SimulatorInterface *simulator,
ui(new Ui::SimulatedUIWidgetX9LITE) ui(new Ui::SimulatedUIWidgetX9LITE)
{ {
RadioUiAction * act; RadioUiAction * act;
QPolygon polygon;
ui->setupUi(this); ui->setupUi(this);
// add actions in order of appearance on the help menu // add actions in order of appearance on the help menu
QPoint ctr(70, 91); QPoint ctr(70, 91);
polygon << polyArc(ctr.x(), ctr.y(), 50, -90, 90) << polyArc(ctr.x(), ctr.y(), 22, -90, 90);
act = new RadioUiAction(0, QList<int>() << Qt::Key_PageUp << Qt::Key_Up, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_MENU_ICN); act = new RadioUiAction(0, QList<int>() << Qt::Key_PageUp << Qt::Key_Up, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_MENU_ICN);
addRadioWidget(ui->leftbuttons->addArea(polyArc(ctr.x(), ctr.y(), 20), "X9LITE/left_menu.png", act)); addRadioWidget(ui->leftbuttons->addArea(QRect(80, 20, 40, 35), "X9LITE/left_menu.png", act));
act = new RadioUiAction(3, QList<int>() << Qt::Key_PageDown << Qt::Key_Down, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_PAGE); act = new RadioUiAction(3, QList<int>() << Qt::Key_PageDown << Qt::Key_Down, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_PAGE);
addRadioWidget(ui->leftbuttons->addArea(polygon, "X9LITE/left_page.png", act)); addRadioWidget(ui->leftbuttons->addArea(QRect(80, 65, 40, 35), "X9LITE/left_page.png", act));
polygon.clear();
polygon << polyArc(ctr.x(), ctr.y(), 50, 90, 270) << polyArc(ctr.x(), ctr.y(), 22, 90, 270);
act = new RadioUiAction(1, QList<int>() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); act = new RadioUiAction(1, QList<int>() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT);
addRadioWidget(ui->leftbuttons->addArea(polygon, "X9LITE/left_exit.png", act)); addRadioWidget(ui->leftbuttons->addArea(QRect(80, 130, 40, 35), "X9LITE/left_exit.png", act));
m_scrollUpAction = new RadioUiAction(-1, QList<int>() << Qt::Key_Minus << Qt::Key_Equal << Qt::Key_Left, SIMU_STR_HLP_KEYS_GO_LFT, SIMU_STR_HLP_ACT_ROT_LFT); m_scrollUpAction = new RadioUiAction(-1, QList<int>() << Qt::Key_Minus << Qt::Key_Equal << Qt::Key_Left, SIMU_STR_HLP_KEYS_GO_LFT, SIMU_STR_HLP_ACT_ROT_LFT);
m_scrollDnAction = new RadioUiAction(-1, QList<int>() << Qt::Key_Plus << Qt::Key_Right, SIMU_STR_HLP_KEYS_GO_RGT, SIMU_STR_HLP_ACT_ROT_RGT); m_scrollDnAction = new RadioUiAction(-1, QList<int>() << Qt::Key_Plus << Qt::Key_Right, SIMU_STR_HLP_KEYS_GO_RGT, SIMU_STR_HLP_ACT_ROT_RGT);
@ -34,7 +31,7 @@ SimulatedUIWidgetX9LITE::SimulatedUIWidgetX9LITE(SimulatorInterface *simulator,
m_mouseMidClickAction = new RadioUiAction(2, QList<int>() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); m_mouseMidClickAction = new RadioUiAction(2, QList<int>() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN);
addRadioWidget(ui->rightbuttons->addArea(polyArc(88, 92, 33), "X9LITE/right_ent.png", m_mouseMidClickAction)); addRadioWidget(ui->rightbuttons->addArea(polyArc(88, 92, 33), "X9LITE/right_ent.png", m_mouseMidClickAction));
addRadioWidget(ui->leftbuttons->addArea(QRect(9, 154, 30, 30), "X9LITE/left_scrnshot.png", m_screenshotAction)); addRadioWidget(ui->leftbuttons->addArea(QRect(30, 154, 30, 30), "X9LITE/left_scrnshot.png", m_screenshotAction));
m_backlightColors << QColor(215, 243, 255); // X9LITE Blue m_backlightColors << QColor(215, 243, 255); // X9LITE Blue
m_backlightColors << QColor(166,247,159); m_backlightColors << QColor(166,247,159);
@ -45,10 +42,10 @@ SimulatedUIWidgetX9LITE::SimulatedUIWidgetX9LITE(SimulatorInterface *simulator,
setLcd(ui->lcd); setLcd(ui->lcd);
QString css = "#radioUiWidget {" QString css = "#radioUiWidget {"
"background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1," "background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1,"
"stop:0 rgba(255, 255, 255, 255)," "stop:0 rgba(255, 255, 255, 255),"
"stop:0.757062 rgba(241, 238, 238, 255)," "stop:0.757062 rgba(241, 238, 238, 255),"
"stop:1 rgba(247, 245, 245, 255));" "stop:1 rgba(247, 245, 245, 255));"
"}"; "}";
QTimer * tim = new QTimer(this); QTimer * tim = new QTimer(this);

50
companion/src/simulation/simulateduiwidgetX9LITE.ui
View file

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>570</width> <width>650</width>
<height>208</height> <height>208</height>
</rect> </rect>
</property> </property>
@ -18,14 +18,14 @@
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>570</width> <width>603</width>
<height>208</height> <height>235</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>570</width> <width>603</width>
<height>208</height> <height>240</height>
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -60,14 +60,14 @@
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>157</width> <width>173</width>
<height>186</height> <height>210</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>157</width> <width>173</width>
<height>186</height> <height>210</height>
</size> </size>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
@ -85,14 +85,14 @@
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>256</width> <width>602</width>
<height>128</height> <height>129</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>424</width> <width>602</width>
<height>128</height> <height>129</height>
</size> </size>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
@ -110,14 +110,14 @@
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>157</width> <width>174</width>
<height>186</height> <height>210</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>157</width> <width>174</width>
<height>186</height> <height>210</height>
</size> </size>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
@ -135,14 +135,14 @@
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>256</width> <width>258</width>
<height>48</height> <height>35</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>256</width> <width>258</width>
<height>48</height> <height>35</height>
</size> </size>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
@ -160,14 +160,14 @@
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>256</width> <width>258</width>
<height>10</height> <height>46</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>256</width> <width>258</width>
<height>10</height> <height>46</height>
</size> </size>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">

2
companion/src/simulation/simulatorstartupdialog.cpp
View file

@ -86,7 +86,7 @@ void SimulatorStartupDialog::changeEvent(QEvent *e)
// FIXME : need a better way to check for this // FIXME : need a better way to check for this
bool SimulatorStartupDialog::usesCategorizedStorage(const QString & name) bool SimulatorStartupDialog::usesCategorizedStorage(const QString & name)
{ {
return name.contains(QRegExp("(x12|x10|horus)", Qt::CaseInsensitive)); return name.contains(QRegExp("(x12|x10|horus|t16)", Qt::CaseInsensitive));
} }
bool SimulatorStartupDialog::usesCategorizedStorage() bool SimulatorStartupDialog::usesCategorizedStorage()

10
companion/src/simulation/simulatorwidget.cpp
View file

@ -60,6 +60,7 @@ SimulatorWidget::SimulatorWidget(QWidget * parent, SimulatorInterface * simulato
switch(m_board) { switch(m_board) {
case Board::BOARD_TARANIS_X9LITE: case Board::BOARD_TARANIS_X9LITE:
case Board::BOARD_TARANIS_X9LITES:
radioUiWidget = new SimulatedUIWidgetX9LITE(simulator, this); radioUiWidget = new SimulatedUIWidgetX9LITE(simulator, this);
break; break;
case Board::BOARD_TARANIS_X7: case Board::BOARD_TARANIS_X7:
@ -67,9 +68,11 @@ SimulatorWidget::SimulatorWidget(QWidget * parent, SimulatorInterface * simulato
break; break;
case Board::BOARD_TARANIS_X9D: case Board::BOARD_TARANIS_X9D:
case Board::BOARD_TARANIS_X9DP: case Board::BOARD_TARANIS_X9DP:
case Board::BOARD_TARANIS_X9DP_2019:
radioUiWidget = new SimulatedUIWidgetX9(simulator, this); radioUiWidget = new SimulatedUIWidgetX9(simulator, this);
break; break;
case Board::BOARD_TARANIS_X9DP_2019:
radioUiWidget = new SimulatedUIWidgetX9D2019(simulator, this);
break;
case Board::BOARD_TARANIS_XLITE: case Board::BOARD_TARANIS_XLITE:
case Board::BOARD_TARANIS_XLITES: case Board::BOARD_TARANIS_XLITES:
radioUiWidget = new SimulatedUIWidgetXLITE(simulator, this); radioUiWidget = new SimulatedUIWidgetXLITE(simulator, this);
@ -86,7 +89,10 @@ SimulatorWidget::SimulatorWidget(QWidget * parent, SimulatorInterface * simulato
break; break;
case Board::BOARD_JUMPER_T12: case Board::BOARD_JUMPER_T12:
radioUiWidget = new SimulatedUIWidgetJumperT12(simulator, this); radioUiWidget = new SimulatedUIWidgetJumperT12(simulator, this);
break; break;
case Board::BOARD_JUMPER_T16:
radioUiWidget = new SimulatedUIWidgetJumperT16(simulator, this);
break;
default: default:
radioUiWidget = new SimulatedUIWidget9X(simulator, this); radioUiWidget = new SimulatedUIWidget9X(simulator, this);
break; break;

14
companion/src/tests/conversions.cpp
View file

@ -42,7 +42,7 @@ TEST(Conversions, ConversionX9DPFrom22)
EXPECT_STREQ("Thr", model.inputNames[0]); EXPECT_STREQ("Thr", model.inputNames[0]);
EXPECT_STREQ("Tes", model.sensorData[0].label); EXPECT_STREQ("Tes", model.sensorData[0].label);
EXPECT_EQ(10, model.sensorData[0].id); EXPECT_EQ(10, model.sensorData[0].id);
EXPECT_EQ(9, model.sensorData[0].instance); EXPECT_EQ(10, model.sensorData[0].instance);
EXPECT_EQ(RawSource(SOURCE_TYPE_TELEMETRY,0).toValue(), model.logicalSw[0].val1); EXPECT_EQ(RawSource(SOURCE_TYPE_TELEMETRY,0).toValue(), model.logicalSw[0].val1);
} }
@ -77,7 +77,7 @@ TEST(Conversions, ConversionX9DPFrom23)
EXPECT_STREQ("Rud", model1.inputNames[0]); EXPECT_STREQ("Rud", model1.inputNames[0]);
EXPECT_STREQ("Tes", model1.sensorData[0].label); EXPECT_STREQ("Tes", model1.sensorData[0].label);
EXPECT_EQ(10, model1.sensorData[0].id); EXPECT_EQ(10, model1.sensorData[0].id);
EXPECT_EQ(10, model1.sensorData[0].instance); EXPECT_EQ(11, model1.sensorData[0].instance);
EXPECT_EQ(RawSource(SOURCE_TYPE_TELEMETRY,0).toValue(), model1.logicalSw[0].val1); EXPECT_EQ(RawSource(SOURCE_TYPE_TELEMETRY,0).toValue(), model1.logicalSw[0].val1);
const ModelData & model2 = radioData.models[1]; const ModelData & model2 = radioData.models[1];
@ -96,7 +96,7 @@ TEST(Conversions, ConversionX9DPFrom23)
EXPECT_STREQ("Rud", model2.inputNames[0]); EXPECT_STREQ("Rud", model2.inputNames[0]);
EXPECT_STREQ("Tes", model2.sensorData[0].label); EXPECT_STREQ("Tes", model2.sensorData[0].label);
EXPECT_EQ(10, model2.sensorData[0].id); EXPECT_EQ(10, model2.sensorData[0].id);
EXPECT_EQ(10, model2.sensorData[0].instance); EXPECT_EQ(11, model2.sensorData[0].instance);
EXPECT_EQ(RawSource(SOURCE_TYPE_TELEMETRY,0).toValue(), model2.logicalSw[0].val1); EXPECT_EQ(RawSource(SOURCE_TYPE_TELEMETRY,0).toValue(), model2.logicalSw[0].val1);
} }
@ -130,7 +130,7 @@ TEST(Conversions, ConversionX7From22)
EXPECT_STREQ("Tes", model.sensorData[0].label); EXPECT_STREQ("Tes", model.sensorData[0].label);
EXPECT_EQ(10, model.sensorData[0].id); EXPECT_EQ(10, model.sensorData[0].id);
EXPECT_EQ(9, model.sensorData[0].instance); EXPECT_EQ(10, model.sensorData[0].instance);
EXPECT_EQ(900, model.limitData[0].max); // -100 EXPECT_EQ(900, model.limitData[0].max); // -100
EXPECT_EQ(10, model.flightModeData[0].gvars[0]); EXPECT_EQ(10, model.flightModeData[0].gvars[0]);
@ -178,7 +178,7 @@ TEST(Conversions, ConversionXLiteFrom22)
EXPECT_STREQ("Tes", model.sensorData[0].label); EXPECT_STREQ("Tes", model.sensorData[0].label);
EXPECT_EQ(10, model.sensorData[0].id); EXPECT_EQ(10, model.sensorData[0].id);
EXPECT_EQ(8, model.sensorData[0].instance); EXPECT_EQ(9, model.sensorData[0].instance);
EXPECT_EQ(900, model.limitData[0].max); // -100 EXPECT_EQ(900, model.limitData[0].max); // -100
EXPECT_EQ(LS_FN_VPOS, model.logicalSw[0].func); EXPECT_EQ(LS_FN_VPOS, model.logicalSw[0].func);
@ -284,7 +284,7 @@ TEST(Conversions, ConversionX10From22)
EXPECT_STREQ("Rud", model.inputNames[0]); EXPECT_STREQ("Rud", model.inputNames[0]);
EXPECT_STREQ("Tes", model.sensorData[0].label); EXPECT_STREQ("Tes", model.sensorData[0].label);
EXPECT_EQ(10, model.sensorData[0].id); EXPECT_EQ(10, model.sensorData[0].id);
EXPECT_EQ(9, model.sensorData[0].instance); EXPECT_EQ(10, model.sensorData[0].instance);
EXPECT_EQ(5 + 2 + 3, model.thrTraceSrc); // CH3 EXPECT_EQ(5 + 2 + 3, model.thrTraceSrc); // CH3
} }
@ -360,6 +360,6 @@ TEST(Conversions, ConversionX12SFrom22)
EXPECT_STREQ("Rud", model.inputNames[0]); EXPECT_STREQ("Rud", model.inputNames[0]);
EXPECT_STREQ("Tes", model.sensorData[0].label); EXPECT_STREQ("Tes", model.sensorData[0].label);
EXPECT_EQ(10, model.sensorData[0].id); EXPECT_EQ(10, model.sensorData[0].id);
EXPECT_EQ(9, model.sensorData[0].instance); EXPECT_EQ(10, model.sensorData[0].instance);
EXPECT_EQ(5 + 2 + 3, model.thrTraceSrc); // CH3 EXPECT_EQ(5 + 2 + 3, model.thrTraceSrc); // CH3
} }

109
companion/src/translations/companion_cs.ts
View file

@ -68,17 +68,17 @@
<message> <message>
<location filename="../storage/appdata.cpp" line="594"/> <location filename="../storage/appdata.cpp" line="594"/>
<source>Could not save Application Settings to file &quot;%1&quot;</source> <source>Could not save Application Settings to file &quot;%1&quot;</source>
<translation type="unfinished"></translation> <translation>Nelze uložit nastavení aplikace do souboru &quot;%1&quot;</translation>
</message> </message>
<message> <message>
<location filename="../storage/appdata.cpp" line="596"/> <location filename="../storage/appdata.cpp" line="596"/>
<source>because the file could not be saved (check access permissions).</source> <source>because the file could not be saved (check access permissions).</source>
<translation type="unfinished"></translation> <translation>protože soubor nemůže být uložen (zkontrolujte přístupová práva)</translation>
</message> </message>
<message> <message>
<location filename="../storage/appdata.cpp" line="598"/> <location filename="../storage/appdata.cpp" line="598"/>
<source>for unknown reasons.</source> <source>for unknown reasons.</source>
<translation type="unfinished"></translation> <translation>z neznámého důvodu.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -86,7 +86,7 @@
<message> <message>
<location filename="../warnings.h" line="95"/> <location filename="../warnings.h" line="95"/>
<source>Show this message again at next startup?</source> <source>Show this message again at next startup?</source>
<translation type="unfinished">Chcete zobrazit toto upozornění i příště ?</translation> <translation>Zobrazit toto upozornění i při příštím spuštění?</translation>
</message> </message>
</context> </context>
<context> <context>
@ -710,7 +710,7 @@ Mode 4:
<location filename="../../../cmake-build-x12s/companion/src/ui_apppreferencesdialog.h" line="1078"/> <location filename="../../../cmake-build-x12s/companion/src/ui_apppreferencesdialog.h" line="1078"/>
<location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="1078"/> <location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="1078"/>
<source>Release channel</source> <source>Release channel</source>
<translation type="unfinished"></translation> <translation>Kanál vydání</translation>
</message> </message>
<message> <message>
<location filename="../apppreferencesdialog.ui" line="1143"/> <location filename="../apppreferencesdialog.ui" line="1143"/>
@ -785,7 +785,7 @@ Mode 4:
<location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="982"/> <location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="982"/>
<location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="989"/> <location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="989"/>
<source>Append version number to FW file name</source> <source>Append version number to FW file name</source>
<translation>Přidat číslo verze do názvu souboru staženého firmwaru </translation> <translation>Přidat číslo verze do názvu souboru staženého firmwaru</translation>
</message> </message>
<message> <message>
<location filename="../apppreferencesdialog.ui" line="190"/> <location filename="../apppreferencesdialog.ui" line="190"/>
@ -797,7 +797,7 @@ Mode 4:
<location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="952"/> <location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="952"/>
<location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="959"/> <location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="959"/>
<source>Offer to write FW to Tx after download</source> <source>Offer to write FW to Tx after download</source>
<translation>Po stažení firmwaru nabídnout okamžité zapsání do rádia </translation> <translation>Po stažení firmwaru nabídnout okamžité zapsání do rádia</translation>
</message> </message>
<message> <message>
<location filename="../apppreferencesdialog.ui" line="636"/> <location filename="../apppreferencesdialog.ui" line="636"/>
@ -1057,7 +1057,7 @@ Mode 4:
<location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="1041"/> <location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="1041"/>
<location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="1044"/> <location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="1044"/>
<source>most recently used files</source> <source>most recently used files</source>
<translation type="unfinished"></translation> <translation>naposledny použité soubory</translation>
</message> </message>
<message> <message>
<location filename="../apppreferencesdialog.ui" line="776"/> <location filename="../apppreferencesdialog.ui" line="776"/>
@ -1069,7 +1069,7 @@ Mode 4:
<location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="1042"/> <location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="1042"/>
<location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="1045"/> <location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="1045"/>
<source>Startup Settings</source> <source>Startup Settings</source>
<translation type="unfinished"></translation> <translation>Nastavení zapnutí</translation>
</message> </message>
<message> <message>
<location filename="../apppreferencesdialog.ui" line="832"/> <location filename="../apppreferencesdialog.ui" line="832"/>
@ -1081,7 +1081,7 @@ Mode 4:
<location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="1045"/> <location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="1045"/>
<location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="1049"/> <location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="1049"/>
<source>Remember</source> <source>Remember</source>
<translation type="unfinished"></translation> <translation>Zapamatovat</translation>
</message> </message>
<message> <message>
<location filename="../apppreferencesdialog.ui" line="913"/> <location filename="../apppreferencesdialog.ui" line="913"/>
@ -1093,7 +1093,7 @@ Mode 4:
<location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="1049"/> <location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="1049"/>
<location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="1056"/> <location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="1056"/>
<source>Output Logs Folder</source> <source>Output Logs Folder</source>
<translation type="unfinished"></translation> <translation>Výstupní složka pro záznamy</translation>
</message> </message>
<message> <message>
<location filename="../apppreferencesdialog.ui" line="900"/> <location filename="../apppreferencesdialog.ui" line="900"/>
@ -1141,7 +1141,7 @@ Mode 4:
<location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="1056"/> <location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="1056"/>
<location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="1060"/> <location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="1060"/>
<source>Just create the model</source> <source>Just create the model</source>
<translation>Jen vytvořit model</translation> <translation>Pouze vytvořit model</translation>
</message> </message>
<message> <message>
<location filename="../apppreferencesdialog.ui" line="926"/> <location filename="../apppreferencesdialog.ui" line="926"/>
@ -1153,7 +1153,7 @@ Mode 4:
<location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="1058"/> <location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="1058"/>
<location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="1057"/> <location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="1057"/>
<source>Debug Output Logging</source> <source>Debug Output Logging</source>
<translation type="unfinished"></translation> <translation>Záznam pro režim ladění</translation>
</message> </message>
<message> <message>
<location filename="../apppreferencesdialog.ui" line="1107"/> <location filename="../apppreferencesdialog.ui" line="1107"/>
@ -1177,7 +1177,7 @@ Mode 4:
<location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="1067"/> <location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="1067"/>
<location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="1073"/> <location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="1073"/>
<source>Application (Companion/Simulator)</source> <source>Application (Companion/Simulator)</source>
<translation type="unfinished"></translation> <translation>Použití (Companion/Simulátor)</translation>
</message> </message>
<message> <message>
<location filename="../apppreferencesdialog.ui" line="1117"/> <location filename="../apppreferencesdialog.ui" line="1117"/>
@ -1201,7 +1201,7 @@ Mode 4:
<location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="1071"/> <location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="1071"/>
<location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="1077"/> <location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="1077"/>
<source>Radio Firmware (in Simulator)</source> <source>Radio Firmware (in Simulator)</source>
<translation type="unfinished"></translation> <translation>Firmware vysílače (v simulátoru)</translation>
</message> </message>
<message> <message>
<location filename="../apppreferencesdialog.ui" line="1213"/> <location filename="../apppreferencesdialog.ui" line="1213"/>
@ -1273,7 +1273,7 @@ Mode 4:
<location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="1083"/> <location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="1083"/>
<location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="1091"/> <location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="1091"/>
<source>Screenshot capture folder</source> <source>Screenshot capture folder</source>
<translation type="unfinished"></translation> <translation>Složka pro snímky obrazovky</translation>
</message> </message>
<message> <message>
<location filename="../apppreferencesdialog.ui" line="1309"/> <location filename="../apppreferencesdialog.ui" line="1309"/>
@ -1285,7 +1285,7 @@ Mode 4:
<location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="1087"/> <location filename="../../../cmake-build-x9-lite/companion/src/ui_apppreferencesdialog.h" line="1087"/>
<location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="1095"/> <location filename="../../../cmake-build-x9d-2019/companion/src/ui_apppreferencesdialog.h" line="1095"/>
<source>Joystick</source> <source>Joystick</source>
<translation></translation> <translation>Joystick</translation>
</message> </message>
<message> <message>
<location filename="../apppreferencesdialog.ui" line="1199"/> <location filename="../apppreferencesdialog.ui" line="1199"/>
@ -1336,7 +1336,7 @@ Mode 4:
<message> <message>
<location filename="../apppreferencesdialog.cpp" line="154"/> <location filename="../apppreferencesdialog.cpp" line="154"/>
<source>Select your snapshot folder</source> <source>Select your snapshot folder</source>
<translation>Vyberat složku pro snímky obrazovky simulátoru</translation> <translation>Vybrat složku pro snímky obrazovky simulátoru</translation>
</message> </message>
<message> <message>
<location filename="../apppreferencesdialog.cpp" line="181"/> <location filename="../apppreferencesdialog.cpp" line="181"/>
@ -1378,7 +1378,7 @@ Mode 4:
<message> <message>
<location filename="../apppreferencesdialog.cpp" line="341"/> <location filename="../apppreferencesdialog.cpp" line="341"/>
<source>Select a folder for application logs</source> <source>Select a folder for application logs</source>
<translation type="unfinished"></translation> <translation>Vybrat složku pro záznamy aplikace</translation>
</message> </message>
<message> <message>
<location filename="../apppreferencesdialog.cpp" line="349"/> <location filename="../apppreferencesdialog.cpp" line="349"/>
@ -1388,7 +1388,7 @@ Mode 4:
<message> <message>
<location filename="../apppreferencesdialog.cpp" line="392"/> <location filename="../apppreferencesdialog.cpp" line="392"/>
<source>Select the folder replicating your SD structure</source> <source>Select the folder replicating your SD structure</source>
<translation>Vyberat složku která představuje obsah SD karty rádia</translation> <translation>Vybrat složku, která představuje obsah SD karty rádia</translation>
</message> </message>
<message> <message>
<location filename="../apppreferencesdialog.cpp" line="423"/> <location filename="../apppreferencesdialog.cpp" line="423"/>
@ -1431,30 +1431,31 @@ Mode 4:
<message> <message>
<location filename="../storage/bineeprom.cpp" line="42"/> <location filename="../storage/bineeprom.cpp" line="42"/>
<source>Error reading %1: %2</source> <source>Error reading %1: %2</source>
<translation type="unfinished"></translation> <translation>Chyba čtení %1: %2</translation>
</message> </message>
<message> <message>
<location filename="../storage/bineeprom.cpp" line="65"/> <location filename="../storage/bineeprom.cpp" line="65"/>
<source>Cannot save EEPROM</source> <source>Cannot save EEPROM</source>
<translation type="unfinished"></translation> <translation>Nelze uložit do EEPROM</translation>
</message> </message>
<message> <message>
<location filename="../storage/bineeprom.cpp" line="76"/> <location filename="../storage/bineeprom.cpp" line="76"/>
<source>Cannot open file %1: <source>Cannot open file %1:
%2.</source> %2.</source>
<translation type="unfinished"></translation> <translation>Nelze otevřít soubor %1:
%2</translation>
</message> </message>
<message> <message>
<location filename="../storage/bineeprom.cpp" line="83"/> <location filename="../storage/bineeprom.cpp" line="83"/>
<source>Error writing file %1: <source>Error writing file %1:
%2.</source> %2.</source>
<translation type="unfinished">Chyba při zápisu souboru %1: <translation>Chyba při zápisu souboru %1:
%2.</translation> %2.</translation>
</message> </message>
<message> <message>
<location filename="../storage/bineeprom.cpp" line="108"/> <location filename="../storage/bineeprom.cpp" line="108"/>
<source>Invalid binary EEPROM file %1</source> <source>Invalid binary EEPROM file %1</source>
<translation type="unfinished"></translation> <translation>Neplatný binární EEPROM soubor %1</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1462,22 +1463,22 @@ Mode 4:
<message> <message>
<location filename="../firmwares/boards.cpp" line="368"/> <location filename="../firmwares/boards.cpp" line="368"/>
<source>Left Horizontal</source> <source>Left Horizontal</source>
<translation type="unfinished">Levá horizontální</translation> <translation>Levá horizontální</translation>
</message> </message>
<message> <message>
<location filename="../firmwares/boards.cpp" line="369"/> <location filename="../firmwares/boards.cpp" line="369"/>
<source>Left Vertical</source> <source>Left Vertical</source>
<translation type="unfinished">Levá vertikální</translation> <translation>Levá vertikální</translation>
</message> </message>
<message> <message>
<location filename="../firmwares/boards.cpp" line="370"/> <location filename="../firmwares/boards.cpp" line="370"/>
<source>Right Vertical</source> <source>Right Vertical</source>
<translation type="unfinished">Pravá vertikální</translation> <translation>Pravá vertikální</translation>
</message> </message>
<message> <message>
<location filename="../firmwares/boards.cpp" line="371"/> <location filename="../firmwares/boards.cpp" line="371"/>
<source>Right Horizontal</source> <source>Right Horizontal</source>
<translation type="unfinished">Pravá horizontální</translation> <translation>Pravá horizontální</translation>
</message> </message>
<message> <message>
<location filename="../firmwares/boards.cpp" line="372"/> <location filename="../firmwares/boards.cpp" line="372"/>
@ -1493,27 +1494,27 @@ Mode 4:
<location filename="../firmwares/boards.cpp" line="378"/> <location filename="../firmwares/boards.cpp" line="378"/>
<location filename="../firmwares/boards.cpp" line="521"/> <location filename="../firmwares/boards.cpp" line="521"/>
<source>Unknown</source> <source>Unknown</source>
<translation type="unfinished">Neznámý</translation> <translation>Neznámý</translation>
</message> </message>
<message> <message>
<location filename="../firmwares/boards.cpp" line="388"/> <location filename="../firmwares/boards.cpp" line="388"/>
<source>Rud</source> <source>Rud</source>
<translation type="unfinished">Směrovka</translation> <translation>Směrovka</translation>
</message> </message>
<message> <message>
<location filename="../firmwares/boards.cpp" line="389"/> <location filename="../firmwares/boards.cpp" line="389"/>
<source>Ele</source> <source>Ele</source>
<translation type="unfinished">Výškovka</translation> <translation>Výškovka</translation>
</message> </message>
<message> <message>
<location filename="../firmwares/boards.cpp" line="390"/> <location filename="../firmwares/boards.cpp" line="390"/>
<source>Thr</source> <source>Thr</source>
<translation type="unfinished">Plyn</translation> <translation>Plyn</translation>
</message> </message>
<message> <message>
<location filename="../firmwares/boards.cpp" line="391"/> <location filename="../firmwares/boards.cpp" line="391"/>
<source>Ail</source> <source>Ail</source>
<translation type="unfinished">Křidélka</translation> <translation>Křidélka</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1521,17 +1522,17 @@ Mode 4:
<message> <message>
<location filename="../generaledit/calibration.cpp" line="44"/> <location filename="../generaledit/calibration.cpp" line="44"/>
<source>Negative span</source> <source>Negative span</source>
<translation type="unfinished">Negativní</translation> <translation>Záporný rozsah</translation>
</message> </message>
<message> <message>
<location filename="../generaledit/calibration.cpp" line="44"/> <location filename="../generaledit/calibration.cpp" line="44"/>
<source>Mid value</source> <source>Mid value</source>
<translation type="unfinished">Střed</translation> <translation>Střední hodnota</translation>
</message> </message>
<message> <message>
<location filename="../generaledit/calibration.cpp" line="44"/> <location filename="../generaledit/calibration.cpp" line="44"/>
<source>Positive span</source> <source>Positive span</source>
<translation type="unfinished">Pozitivní</translation> <translation>Kladný rozsah</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1539,22 +1540,22 @@ Mode 4:
<message> <message>
<location filename="../storage/categorized.cpp" line="28"/> <location filename="../storage/categorized.cpp" line="28"/>
<source>Can&apos;t extract RADIO/radio.bin</source> <source>Can&apos;t extract RADIO/radio.bin</source>
<translation type="unfinished"></translation> <translation>Nelze rozbalit RADIO/radio.bin</translation>
</message> </message>
<message> <message>
<location filename="../storage/categorized.cpp" line="41"/> <location filename="../storage/categorized.cpp" line="41"/>
<source>Can&apos;t extract RADIO/models.txt</source> <source>Can&apos;t extract RADIO/models.txt</source>
<translation type="unfinished"></translation> <translation>Nelze rozbalit RADIO/models.txt</translation>
</message> </message>
<message> <message>
<location filename="../storage/categorized.cpp" line="85"/> <location filename="../storage/categorized.cpp" line="85"/>
<source>Can&apos;t extract %1</source> <source>Can&apos;t extract %1</source>
<translation type="unfinished"></translation> <translation>Nelze rozbalit %1</translation>
</message> </message>
<message> <message>
<location filename="../storage/categorized.cpp" line="92"/> <location filename="../storage/categorized.cpp" line="92"/>
<source>Error loading models</source> <source>Error loading models</source>
<translation type="unfinished"></translation> <translation>Chyba při načítání modelů</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1567,17 +1568,17 @@ Mode 4:
<message> <message>
<location filename="../modeledit/channels.cpp" line="111"/> <location filename="../modeledit/channels.cpp" line="111"/>
<source>Min</source> <source>Min</source>
<translation></translation> <translation>Min</translation>
</message> </message>
<message> <message>
<location filename="../modeledit/channels.cpp" line="111"/> <location filename="../modeledit/channels.cpp" line="111"/>
<source>Max</source> <source>Max</source>
<translation></translation> <translation>Max</translation>
</message> </message>
<message> <message>
<location filename="../modeledit/channels.cpp" line="111"/> <location filename="../modeledit/channels.cpp" line="111"/>
<source>Subtrim</source> <source>Subtrim</source>
<translation></translation> <translation>Subtrim</translation>
</message> </message>
<message> <message>
<location filename="../modeledit/channels.cpp" line="111"/> <location filename="../modeledit/channels.cpp" line="111"/>
@ -2553,27 +2554,27 @@ Thomasi Hustererovi (th9x) a také Erazovi Ravivovi(er9x a eePe)</translation>
<message> <message>
<location filename="../firmwares/customfunctiondata.cpp" line="71"/> <location filename="../firmwares/customfunctiondata.cpp" line="71"/>
<source>Play Track</source> <source>Play Track</source>
<translation type="unfinished">Hrát stopu</translation> <translation>Přehrát stopu</translation>
</message> </message>
<message> <message>
<location filename="../firmwares/customfunctiondata.cpp" line="73"/> <location filename="../firmwares/customfunctiondata.cpp" line="73"/>
<source>Play Both</source> <source>Play Both</source>
<translation type="unfinished">Přehrát pár</translation> <translation>Přehrát oboje</translation>
</message> </message>
<message> <message>
<location filename="../firmwares/customfunctiondata.cpp" line="75"/> <location filename="../firmwares/customfunctiondata.cpp" line="75"/>
<source>Play Value</source> <source>Play Value</source>
<translation type="unfinished">Přehrát hodnotu</translation> <translation>Přehrát hodnotu</translation>
</message> </message>
<message> <message>
<location filename="../firmwares/customfunctiondata.cpp" line="77"/> <location filename="../firmwares/customfunctiondata.cpp" line="77"/>
<source>Play Script</source> <source>Play Script</source>
<translation type="unfinished">Spustit skript</translation> <translation>Spustit skript</translation>
</message> </message>
<message> <message>
<location filename="../firmwares/customfunctiondata.cpp" line="79"/> <location filename="../firmwares/customfunctiondata.cpp" line="79"/>
<source>SD Logs</source> <source>SD Logs</source>
<translation type="unfinished">SD logy</translation> <translation>SD záznamy</translation>
</message> </message>
<message> <message>
<location filename="../firmwares/customfunctiondata.cpp" line="81"/> <location filename="../firmwares/customfunctiondata.cpp" line="81"/>
@ -2583,27 +2584,27 @@ Thomasi Hustererovi (th9x) a také Erazovi Ravivovi(er9x a eePe)</translation>
<message> <message>
<location filename="../firmwares/customfunctiondata.cpp" line="83"/> <location filename="../firmwares/customfunctiondata.cpp" line="83"/>
<source>Backlight</source> <source>Backlight</source>
<translation type="unfinished">Podsvětlení</translation> <translation>Podsvětlení</translation>
</message> </message>
<message> <message>
<location filename="../firmwares/customfunctiondata.cpp" line="85"/> <location filename="../firmwares/customfunctiondata.cpp" line="85"/>
<source>Screenshot</source> <source>Screenshot</source>
<translation type="unfinished">Snímek LCD</translation> <translation>Snímek obrazovky</translation>
</message> </message>
<message> <message>
<location filename="../firmwares/customfunctiondata.cpp" line="87"/> <location filename="../firmwares/customfunctiondata.cpp" line="87"/>
<source>Background Music</source> <source>Background Music</source>
<translation type="unfinished">Hudba na pozadí</translation> <translation>Hudba na pozadí</translation>
</message> </message>
<message> <message>
<location filename="../firmwares/customfunctiondata.cpp" line="89"/> <location filename="../firmwares/customfunctiondata.cpp" line="89"/>
<source>Background Music Pause</source> <source>Background Music Pause</source>
<translation type="unfinished">Hudba na pozadí -pozastavit</translation> <translation>Hudba na pozadí -pozastavit</translation>
</message> </message>
<message> <message>
<location filename="../firmwares/customfunctiondata.cpp" line="91"/> <location filename="../firmwares/customfunctiondata.cpp" line="91"/>
<source>Adjust %1</source> <source>Adjust %1</source>
<translation type="unfinished"></translation> <translation>Upravit %1</translation>
</message> </message>
<message> <message>
<location filename="../firmwares/customfunctiondata.cpp" line="93"/> <location filename="../firmwares/customfunctiondata.cpp" line="93"/>

429
companion/src/translations/companion_de.ts
View file

File diff suppressed because it is too large Load diff

8097
companion/src/translations/companion_fr.ts
View file

File diff suppressed because it is too large Load diff

1
launchpad/common/rules
View file

@ -27,6 +27,7 @@ build:
cd $(BUILDDIR); cmake $(COMMON_OPTIONS) $(STM32_OPTIONS) -DPCB=X9E ../ ; make libsimulator cd $(BUILDDIR); cmake $(COMMON_OPTIONS) $(STM32_OPTIONS) -DPCB=X9E ../ ; make libsimulator
cd $(BUILDDIR); cmake $(COMMON_OPTIONS) $(STM32_OPTIONS) -DPCB=X12S ../ ; make libsimulator cd $(BUILDDIR); cmake $(COMMON_OPTIONS) $(STM32_OPTIONS) -DPCB=X12S ../ ; make libsimulator
cd $(BUILDDIR); cmake $(COMMON_OPTIONS) $(STM32_OPTIONS) -DPCB=JUMPERT12 ../ ; make libsimulator cd $(BUILDDIR); cmake $(COMMON_OPTIONS) $(STM32_OPTIONS) -DPCB=JUMPERT12 ../ ; make libsimulator
cd $(BUILDDIR); cmake $(COMMON_OPTIONS) $(STM32_OPTIONS) -DPCB=JUMPERT16 ../ ; make libsimulator
make -C $(BUILDDIR) companion22 simulator22 make -C $(BUILDDIR) companion22 simulator22

2
radio/sdcard/horus/SCRIPTS/TOOLS/CROSSFIRE/crossfire.lua
View file

@ -91,7 +91,7 @@ local function run(event)
return 2 return 2
elseif event == EVT_VIRTUAL_NEXT then elseif event == EVT_VIRTUAL_NEXT then
selectDevice(1) selectDevice(1)
elseif event == EVT_VIRTUAL_PREVIOUS then elseif event == EVT_VIRTUAL_PREV then
selectDevice(-1) selectDevice(-1)
end end

6
radio/sdcard/horus/SCRIPTS/TOOLS/CROSSFIRE/device.lua
View file

@ -455,15 +455,15 @@ local function runDevicePage(event)
end end
end end
elseif edit then elseif edit then
if event == EVT_VIRTUAL_NEXT then if event == EVT_VIRTUAL_INC then
incrField(1) incrField(1)
elseif event == EVT_VIRTUAL_PREVIOUS then elseif event == EVT_VIRTUAL_DEC then
incrField(-1) incrField(-1)
end end
else else
if event == EVT_VIRTUAL_NEXT then if event == EVT_VIRTUAL_NEXT then
selectField(1) selectField(1)
elseif event == EVT_VIRTUAL_PREVIOUS then elseif event == EVT_VIRTUAL_PREV then
selectField(-1) selectField(-1)
end end
end end

8
radio/sdcard/horus/SCRIPTS/TOOLS/FrSky GaSuite.lua
View file

@ -332,15 +332,15 @@ local function runFieldsPage(event)
end end
end end
elseif edit then elseif edit then
if event == EVT_VIRTUAL_NEXT or event == EVT_VIRTUAL_NEXT_REPT then if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then
addField(1) addField(1)
elseif event == EVT_VIRTUAL_PREVIOUS or event == EVT_VIRTUAL_PREVIOUS_REPT then elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then
addField(-1) addField(-1)
end end
else else
if event == EVT_VIRTUAL_NEXT then if event == EVT_VIRTUAL_NEXT then
selectField(1) selectField(1)
elseif event == EVT_VIRTUAL_PREVIOUS then elseif event == EVT_VIRTUAL_PREV then
selectField(-1) selectField(-1)
end end
end end
@ -500,7 +500,7 @@ local function run(event)
return 2 return 2
elseif event == EVT_VIRTUAL_NEXT_PAGE then elseif event == EVT_VIRTUAL_NEXT_PAGE then
selectPage(1) selectPage(1)
elseif event == EVT_VIRTUAL_PREVIOUS_PAGE then elseif event == EVT_VIRTUAL_PREV_PAGE then
killEvents(event); killEvents(event);
selectPage(-1) selectPage(-1)
end end

6
radio/sdcard/horus/SCRIPTS/TOOLS/FrSky SBEC.lua
View file

@ -221,15 +221,15 @@ local function runFieldsPage(event)
end end
end end
elseif edit then elseif edit then
if event == EVT_VIRTUAL_NEXT or event == EVT_VIRTUAL_NEXT_REPT then if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then
addField(1) addField(1)
elseif event == EVT_VIRTUAL_PREVIOUS or event == EVT_VIRTUAL_PREVIOUS_REPT then elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then
addField(-1) addField(-1)
end end
else else
if event == EVT_VIRTUAL_NEXT then if event == EVT_VIRTUAL_NEXT then
selectField(1) selectField(1)
elseif event == EVT_VIRTUAL_PREVIOUS then elseif event == EVT_VIRTUAL_PREV then
selectField(-1) selectField(-1)
end end
end end

16
radio/sdcard/horus/SCRIPTS/TOOLS/FrSky SxR.lua
View file

@ -44,8 +44,8 @@ local configFields = {
{ "Mounting type", COMBO, 0x81, nil, { "Horz", "Horz rev.", "Vert", "Vert rev." } }, { "Mounting type", COMBO, 0x81, nil, { "Horz", "Horz rev.", "Vert", "Vert rev." } },
} }
local wingBitmapsFile = { "bmp/plane.bmp", "bmp/delta.bmp", "bmp/vtail.bmp" } local wingBitmapsFile = { "/SCRIPTS/TOOLS/bmp/plane.bmp", "/SCRIPTS/TOOLS/bmp/delta.bmp", "/SCRIPTS/TOOLS/bmp/vtail.bmp" }
local mountBitmapsFile = { "bmp/horz.bmp", "bmp/horz-r.bmp", "bmp/vert.bmp", "bmp/vert-r.bmp" } local mountBitmapsFile = { "/SCRIPTS/TOOLS/bmp/horz.bmp", "/SCRIPTS/TOOLS/bmp/horz-r.bmp", "/SCRIPTS/TOOLS/bmp/vert.bmp", "/SCRIPTS/TOOLS/bmp/vert-r.bmp" }
local settingsFields = { local settingsFields = {
{"SxR functions", COMBO, 0x9C, nil, { "Disable", "Enable" } }, {"SxR functions", COMBO, 0x9C, nil, { "Disable", "Enable" } },
@ -268,15 +268,15 @@ local function runFieldsPage(event)
end end
end end
elseif edit then elseif edit then
if event == EVT_VIRTUAL_NEXT or event == EVT_VIRTUAL_NEXT_REPT then if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then
addField(1) addField(1)
elseif event == EVT_VIRTUAL_PREVIOUS or event == EVT_VIRTUAL_PREVIOUS_REPT then elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then
addField(-1) addField(-1)
end end
else else
if event == EVT_VIRTUAL_NEXT then if event == EVT_VIRTUAL_NEXT then
selectField(1) selectField(1)
elseif event == EVT_VIRTUAL_PREVIOUS then elseif event == EVT_VIRTUAL_PREV then
selectField(-1) selectField(-1)
end end
end end
@ -332,8 +332,8 @@ local function init()
if LCD_W == 480 then if LCD_W == 480 then
margin = 10 margin = 10
spacing = 20 spacing = 20
wingBitmapsFile = { "img/plane_b.png", "img/delta_b.png", "img/planev_b.png" } wingBitmapsFile = { "/SCRIPTS/TOOLS/img/plane_b.png", "/SCRIPTS/TOOLS/img/delta_b.png", "/SCRIPTS/TOOLS/img/planev_b.png" }
mountBitmapsFile = { "img/up.png", "img/down.png", "img/vert.png", "img/vert-r.png" } mountBitmapsFile = { "/SCRIPTS/TOOLS/img/up.png", "/SCRIPTS/TOOLS/img/down.png", "/SCRIPTS/TOOLS/img/vert.png", "/SCRIPTS/TOOLS/img/vert-r.png" }
end end
pages = { pages = {
runConfigPage, runConfigPage,
@ -348,7 +348,7 @@ local function run(event)
return 2 return 2
elseif event == EVT_VIRTUAL_NEXT_PAGE then elseif event == EVT_VIRTUAL_NEXT_PAGE then
selectPage(1) selectPage(1)
elseif event == EVT_VIRTUAL_PREVIOUS_PAGE then elseif event == EVT_VIRTUAL_PREV_PAGE then
killEvents(event); killEvents(event);
selectPage(-1) selectPage(-1)
end end

2
radio/sdcard/horus/SCRIPTS/TOOLS/crossfire.lua
View file

@ -30,7 +30,7 @@ local function run(event)
return 2 return 2
end end
chdir("CROSSFIRE") chdir("/SCRIPTS/TOOLS/CROSSFIRE")
return "crossfire.lua" return "crossfire.lua"
end end

Some files were not shown because too many files have changed in this diff Show more