Merge branch 'next' of https://github.com/opentx/opentx into mhotar/modelsetup_items
Conflicts: radio/src/translations/fi.h.txt radio/src/translations/se.h.txt
This commit is contained in:
+11
-1
@@ -333,4 +333,14 @@ Sean Cull
|
|||||||
Roberto Orsello
|
Roberto Orsello
|
||||||
David Finger
|
David Finger
|
||||||
FrSky - www.frsky-rc.com
|
FrSky - www.frsky-rc.com
|
||||||
Jean-marie Oddo
|
Jean-Marie Oddo
|
||||||
|
Mike Matheny
|
||||||
|
Glen Roe (Showmaster)
|
||||||
|
Arron Bates
|
||||||
|
Tim Spurr
|
||||||
|
Daniel Morgan
|
||||||
|
Trent Ready
|
||||||
|
Mark Maskiell
|
||||||
|
Robert Crockford
|
||||||
|
Mark Illum
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
PROJECT( companion )
|
PROJECT( companion )
|
||||||
|
|
||||||
SET( C9X_VERSION_MAJOR "1" )
|
SET( C9X_VERSION_MAJOR "1" )
|
||||||
SET( C9X_VERSION_MINOR "52" )
|
SET( C9X_VERSION_MINOR "99" )
|
||||||
SET( C9X_VERSION ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR} )
|
SET( C9X_VERSION ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR} )
|
||||||
|
|
||||||
CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
|
CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
|
||||||
|
|||||||
@@ -6,8 +6,8 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>685</width>
|
<width>734</width>
|
||||||
<height>462</height>
|
<height>492</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
</property>
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>685</width>
|
<width>0</width>
|
||||||
<height>0</height>
|
<height>0</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
@@ -47,450 +47,9 @@
|
|||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="applicationTab">
|
|
||||||
<attribute name="title">
|
|
||||||
<string>Application Settings</string>
|
|
||||||
</attribute>
|
|
||||||
<layout class="QGridLayout" name="gridLayout_3">
|
|
||||||
<item row="11" column="1" colspan="4">
|
|
||||||
<widget class="Line" name="line_5">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="2">
|
|
||||||
<spacer name="horizontalSpacer_3">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>40</width>
|
|
||||||
<height>20</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
<item row="9" column="0">
|
|
||||||
<widget class="QLabel" name="label_17">
|
|
||||||
<property name="text">
|
|
||||||
<string>Automatic Backup Folder</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="1">
|
|
||||||
<widget class="QSpinBox" name="historySize">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
|
|
||||||
<horstretch>40</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="maximumSize">
|
|
||||||
<size>
|
|
||||||
<width>50</width>
|
|
||||||
<height>16777215</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="maximum">
|
|
||||||
<number>15</number>
|
|
||||||
</property>
|
|
||||||
<property name="value">
|
|
||||||
<number>10</number>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="13" column="0">
|
|
||||||
<widget class="QLabel" name="label_9">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>User Splash Screens</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="12" column="1">
|
|
||||||
<widget class="QComboBox" name="splashincludeCB">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>Only show user splash images</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>Show user and companion splash images</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="0">
|
|
||||||
<widget class="QLabel" name="ge_label">
|
|
||||||
<property name="text">
|
|
||||||
<string>Google Earth Executable</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="1">
|
|
||||||
<widget class="QCheckBox" name="startupCheck_fw">
|
|
||||||
<property name="text">
|
|
||||||
<string>Automatic check for OpenTX firmware updates</string>
|
|
||||||
</property>
|
|
||||||
<property name="checked">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="9" column="1">
|
|
||||||
<widget class="QLineEdit" name="backupPath">
|
|
||||||
<property name="minimumSize">
|
|
||||||
<size>
|
|
||||||
<width>350</width>
|
|
||||||
<height>0</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="readOnly">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="13" column="4">
|
|
||||||
<widget class="QPushButton" name="libraryPathButton">
|
|
||||||
<property name="text">
|
|
||||||
<string>Open Folder</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="1" colspan="4">
|
|
||||||
<widget class="Line" name="line_4">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="1">
|
|
||||||
<widget class="QLineEdit" name="ge_lineedit">
|
|
||||||
<property name="minimumSize">
|
|
||||||
<size>
|
|
||||||
<width>350</width>
|
|
||||||
<height>0</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="readOnly">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="4">
|
|
||||||
<widget class="QPushButton" name="ge_pathButton">
|
|
||||||
<property name="text">
|
|
||||||
<string>Find Executable</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="0">
|
|
||||||
<widget class="QLabel" name="label_5">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Files to keep</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="12" column="0">
|
|
||||||
<widget class="QLabel" name="label_10">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Splash Screen Library</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="10" column="1">
|
|
||||||
<widget class="QCheckBox" name="backupEnable">
|
|
||||||
<property name="text">
|
|
||||||
<string>Enable automatic backup before writing firmware</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="9" column="4">
|
|
||||||
<widget class="QPushButton" name="backupPathButton">
|
|
||||||
<property name="text">
|
|
||||||
<string>Open Folder</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="14" column="1">
|
|
||||||
<spacer name="verticalSpacer_2">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Vertical</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>20</width>
|
|
||||||
<height>40</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
<item row="3" column="1" colspan="4">
|
|
||||||
<widget class="Line" name="line">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="6" column="1">
|
|
||||||
<widget class="QCheckBox" name="startupCheck_companion9x">
|
|
||||||
<property name="text">
|
|
||||||
<string>Automatic check for Companion updates</string>
|
|
||||||
</property>
|
|
||||||
<property name="checked">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="8" column="1" colspan="4">
|
|
||||||
<widget class="Line" name="line_2">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="7" column="1">
|
|
||||||
<widget class="QCheckBox" name="wizardEnable_ChkB">
|
|
||||||
<property name="text">
|
|
||||||
<string>Offer to use wizard for new models</string>
|
|
||||||
</property>
|
|
||||||
<property name="checked">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="1">
|
|
||||||
<widget class="QCheckBox" name="showSplash">
|
|
||||||
<property name="text">
|
|
||||||
<string>Show splash screen when Companion starts</string>
|
|
||||||
</property>
|
|
||||||
<property name="checked">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="3">
|
|
||||||
<spacer name="horizontalSpacer_4">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>40</width>
|
|
||||||
<height>20</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
<item row="13" column="1">
|
|
||||||
<widget class="QLineEdit" name="libraryPath">
|
|
||||||
<property name="enabled">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="readOnly">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
<widget class="QWidget" name="simulatorTab">
|
|
||||||
<attribute name="title">
|
|
||||||
<string>Simulator Settings</string>
|
|
||||||
</attribute>
|
|
||||||
<layout class="QGridLayout" name="gridLayout_4">
|
|
||||||
<item row="3" column="0">
|
|
||||||
<widget class="QLabel" name="label_3">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Simulator BackLight</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="2">
|
|
||||||
<widget class="QCheckBox" name="joystickChkB">
|
|
||||||
<property name="text">
|
|
||||||
<string>Enable</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="4">
|
|
||||||
<widget class="QPushButton" name="snapshotPathButton">
|
|
||||||
<property name="text">
|
|
||||||
<string>Open Folder</string>
|
|
||||||
</property>
|
|
||||||
<property name="flat">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="3">
|
|
||||||
<spacer name="horizontalSpacer_2">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>40</width>
|
|
||||||
<height>20</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
<item row="3" column="1">
|
|
||||||
<widget class="QComboBox" name="backLightColor">
|
|
||||||
<property name="maximumSize">
|
|
||||||
<size>
|
|
||||||
<width>100</width>
|
|
||||||
<height>16777215</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>Blue</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>Green</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>Red</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>Orange</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>Yellow</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="0">
|
|
||||||
<widget class="QLabel" name="label_11">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Joystick</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="1">
|
|
||||||
<widget class="QCheckBox" name="snapshotClipboardCKB">
|
|
||||||
<property name="text">
|
|
||||||
<string>Only capture to clipboard</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="1">
|
|
||||||
<widget class="QComboBox" name="joystickCB">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="4">
|
|
||||||
<widget class="QPushButton" name="joystickcalButton">
|
|
||||||
<property name="text">
|
|
||||||
<string>Calibrate</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="1">
|
|
||||||
<widget class="QCheckBox" name="simuSW">
|
|
||||||
<property name="text">
|
|
||||||
<string>Remember simulator switch values</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="0">
|
|
||||||
<widget class="QLabel" name="label_19">
|
|
||||||
<property name="text">
|
|
||||||
<string>Simulator capture folder</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="6" column="1">
|
|
||||||
<spacer name="verticalSpacer">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Vertical</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>20</width>
|
|
||||||
<height>40</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="1" colspan="2">
|
|
||||||
<widget class="QLineEdit" name="snapshotPath">
|
|
||||||
<property name="enabled">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="minimumSize">
|
|
||||||
<size>
|
|
||||||
<width>350</width>
|
|
||||||
<height>0</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="readOnly">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
<widget class="QWidget" name="profileTab">
|
<widget class="QWidget" name="profileTab">
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
<string>Radio Settings Profile</string>
|
<string>Radio Profile</string>
|
||||||
</attribute>
|
</attribute>
|
||||||
<layout class="QGridLayout" name="gridLayout_2">
|
<layout class="QGridLayout" name="gridLayout_2">
|
||||||
<item row="10" column="1" colspan="3">
|
<item row="10" column="1" colspan="3">
|
||||||
@@ -804,19 +363,6 @@ This is used by the templated to determine which channel goes to what number out
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="4">
|
|
||||||
<spacer name="horizontalSpacer">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>40</width>
|
|
||||||
<height>20</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
<item row="14" column="1" colspan="3">
|
<item row="14" column="1" colspan="3">
|
||||||
<widget class="QCheckBox" name="burnFirmware">
|
<widget class="QCheckBox" name="burnFirmware">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
@@ -867,6 +413,13 @@ This is used by the templated to determine which channel goes to what number out
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="7" column="5">
|
||||||
|
<widget class="QPushButton" name="clearImageButton">
|
||||||
|
<property name="text">
|
||||||
|
<string>Clear Image</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item row="4" column="5">
|
<item row="4" column="5">
|
||||||
<widget class="QPushButton" name="SplashSelect">
|
<widget class="QPushButton" name="SplashSelect">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
@@ -881,13 +434,6 @@ This is used by the templated to determine which channel goes to what number out
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="7" column="5">
|
|
||||||
<widget class="QPushButton" name="clearImageButton">
|
|
||||||
<property name="text">
|
|
||||||
<string>Clear Image</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="3" column="1" colspan="5">
|
<item row="3" column="1" colspan="5">
|
||||||
<widget class="Line" name="line_3">
|
<widget class="Line" name="line_3">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
@@ -938,7 +484,7 @@ This is used by the templated to determine which channel goes to what number out
|
|||||||
<enum>QFrame::Plain</enum>
|
<enum>QFrame::Plain</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="lineWidth">
|
<property name="lineWidth">
|
||||||
<number>1</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string/>
|
<string/>
|
||||||
@@ -987,6 +533,434 @@ This is used by the templated to determine which channel goes to what number out
|
|||||||
</item>
|
</item>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="2" column="4">
|
||||||
|
<spacer name="horizontalSpacer">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
<widget class="QWidget" name="applicationTab">
|
||||||
|
<attribute name="title">
|
||||||
|
<string>Application Settings</string>
|
||||||
|
</attribute>
|
||||||
|
<layout class="QGridLayout" name="gridLayout_3">
|
||||||
|
<item row="9" column="2">
|
||||||
|
<widget class="QPushButton" name="backupPathButton">
|
||||||
|
<property name="text">
|
||||||
|
<string>Open Folder</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="11" column="1" colspan="2">
|
||||||
|
<widget class="Line" name="line_5">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="9" column="0">
|
||||||
|
<widget class="QLabel" name="label_17">
|
||||||
|
<property name="text">
|
||||||
|
<string>Automatic Backup Folder</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="1">
|
||||||
|
<widget class="QSpinBox" name="historySize">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
|
||||||
|
<horstretch>40</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>50</width>
|
||||||
|
<height>16777215</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximum">
|
||||||
|
<number>15</number>
|
||||||
|
</property>
|
||||||
|
<property name="value">
|
||||||
|
<number>10</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="13" column="0">
|
||||||
|
<widget class="QLabel" name="label_9">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>User Splash Screens</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="12" column="1">
|
||||||
|
<widget class="QComboBox" name="splashincludeCB">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>Only show user splash images</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>Show user and companion splash images</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QLabel" name="ge_label">
|
||||||
|
<property name="text">
|
||||||
|
<string>Google Earth Executable</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="5" column="1">
|
||||||
|
<widget class="QCheckBox" name="startupCheck_fw">
|
||||||
|
<property name="text">
|
||||||
|
<string>Automatic check for OpenTX firmware updates</string>
|
||||||
|
</property>
|
||||||
|
<property name="checked">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="9" column="1">
|
||||||
|
<widget class="QLineEdit" name="backupPath">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>350</width>
|
||||||
|
<height>0</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="readOnly">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="13" column="2">
|
||||||
|
<widget class="QPushButton" name="libraryPathButton">
|
||||||
|
<property name="text">
|
||||||
|
<string>Open Folder</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="1" colspan="2">
|
||||||
|
<widget class="Line" name="line_4">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="1">
|
||||||
|
<widget class="QLineEdit" name="ge_lineedit">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>350</width>
|
||||||
|
<height>0</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="readOnly">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="2">
|
||||||
|
<widget class="QPushButton" name="ge_pathButton">
|
||||||
|
<property name="text">
|
||||||
|
<string>Find Executable</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="0">
|
||||||
|
<widget class="QLabel" name="label_5">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Files to keep</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="12" column="0">
|
||||||
|
<widget class="QLabel" name="label_10">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Splash Screen Library</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="10" column="1">
|
||||||
|
<widget class="QCheckBox" name="backupEnable">
|
||||||
|
<property name="text">
|
||||||
|
<string>Enable automatic backup before writing firmware</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="1" colspan="2">
|
||||||
|
<widget class="Line" name="line">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="6" column="1">
|
||||||
|
<widget class="QCheckBox" name="startupCheck_companion9x">
|
||||||
|
<property name="text">
|
||||||
|
<string>Automatic check for Companion updates</string>
|
||||||
|
</property>
|
||||||
|
<property name="checked">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="8" column="1" colspan="2">
|
||||||
|
<widget class="Line" name="line_2">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="7" column="1">
|
||||||
|
<widget class="QCheckBox" name="wizardEnable_ChkB">
|
||||||
|
<property name="text">
|
||||||
|
<string>Offer to use wizard for new models</string>
|
||||||
|
</property>
|
||||||
|
<property name="checked">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="4" column="1">
|
||||||
|
<widget class="QCheckBox" name="showSplash">
|
||||||
|
<property name="text">
|
||||||
|
<string>Show splash screen when Companion starts</string>
|
||||||
|
</property>
|
||||||
|
<property name="checked">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="13" column="1">
|
||||||
|
<widget class="QLineEdit" name="libraryPath">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="readOnly">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="14" column="1" colspan="2">
|
||||||
|
<spacer name="verticalSpacer_2">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Vertical</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>20</width>
|
||||||
|
<height>40</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
<widget class="QWidget" name="simulatorTab">
|
||||||
|
<attribute name="title">
|
||||||
|
<string>Simulator Settings</string>
|
||||||
|
</attribute>
|
||||||
|
<layout class="QGridLayout" name="gridLayout_4">
|
||||||
|
<item row="3" column="0">
|
||||||
|
<widget class="QLabel" name="label_3">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Simulator BackLight</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="5" column="2">
|
||||||
|
<widget class="QCheckBox" name="joystickChkB">
|
||||||
|
<property name="text">
|
||||||
|
<string>Enable</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="4">
|
||||||
|
<widget class="QPushButton" name="snapshotPathButton">
|
||||||
|
<property name="text">
|
||||||
|
<string>Open Folder</string>
|
||||||
|
</property>
|
||||||
|
<property name="flat">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="1">
|
||||||
|
<widget class="QComboBox" name="backLightColor">
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>100</width>
|
||||||
|
<height>16777215</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>Blue</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>Green</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>Red</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>Orange</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>Yellow</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="5" column="0">
|
||||||
|
<widget class="QLabel" name="label_11">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Joystick</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="1">
|
||||||
|
<widget class="QCheckBox" name="snapshotClipboardCKB">
|
||||||
|
<property name="text">
|
||||||
|
<string>Only capture to clipboard</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="5" column="1">
|
||||||
|
<widget class="QComboBox" name="joystickCB">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="5" column="4">
|
||||||
|
<widget class="QPushButton" name="joystickcalButton">
|
||||||
|
<property name="text">
|
||||||
|
<string>Calibrate</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="1">
|
||||||
|
<widget class="QCheckBox" name="simuSW">
|
||||||
|
<property name="text">
|
||||||
|
<string>Remember simulator switch values</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QLabel" name="label_19">
|
||||||
|
<property name="text">
|
||||||
|
<string>Simulator capture folder</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="6" column="1">
|
||||||
|
<spacer name="verticalSpacer">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Vertical</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>20</width>
|
||||||
|
<height>40</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="1" colspan="2">
|
||||||
|
<widget class="QLineEdit" name="snapshotPath">
|
||||||
|
<property name="enabled">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>350</width>
|
||||||
|
<height>0</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="readOnly">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="3">
|
||||||
|
<spacer name="horizontalSpacer_2">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</widget>
|
</widget>
|
||||||
|
|||||||
+16
-33
@@ -6,8 +6,8 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>440</width>
|
<width>399</width>
|
||||||
<height>423</height>
|
<height>564</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
</property>
|
</property>
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>440</width>
|
<width>0</width>
|
||||||
<height>0</height>
|
<height>0</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
@@ -171,6 +171,12 @@
|
|||||||
<verstretch>0</verstretch>
|
<verstretch>0</verstretch>
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>250</width>
|
||||||
|
<height>0</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
<property name="readOnly">
|
<property name="readOnly">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
@@ -254,8 +260,8 @@
|
|||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<layout class="QGridLayout" name="SplashLayout" rowstretch="0,0,0,0,0,0,0">
|
<layout class="QGridLayout" name="SplashLayout" rowstretch="0,0,0,0,0,0,0">
|
||||||
<item row="0" column="1" rowspan="7">
|
<item row="0" column="1" rowspan="7">
|
||||||
<layout class="QGridLayout" name="gridLayout_2" rowstretch="1">
|
<layout class="QGridLayout" name="gridLayout_2" rowstretch="0">
|
||||||
<item row="0" column="1">
|
<item row="0" column="0">
|
||||||
<widget class="QLabel" name="imageLabel">
|
<widget class="QLabel" name="imageLabel">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
|
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
|
||||||
@@ -271,8 +277,8 @@
|
|||||||
</property>
|
</property>
|
||||||
<property name="maximumSize">
|
<property name="maximumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>212</width>
|
<width>214</width>
|
||||||
<height>64</height>
|
<height>66</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="frameShape">
|
<property name="frameShape">
|
||||||
@@ -281,6 +287,9 @@
|
|||||||
<property name="frameShadow">
|
<property name="frameShadow">
|
||||||
<enum>QFrame::Plain</enum>
|
<enum>QFrame::Plain</enum>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="lineWidth">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
@@ -289,32 +298,6 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="2">
|
|
||||||
<spacer name="horizontalSpacer">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>40</width>
|
|
||||||
<height>20</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="0">
|
|
||||||
<spacer name="horizontalSpacer_2">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>40</width>
|
|
||||||
<height>20</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="0">
|
<item row="2" column="0">
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>1087</width>
|
<width>1087</width>
|
||||||
<height>285</height>
|
<height>298</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
@@ -165,6 +165,9 @@
|
|||||||
<property name="frameShadow">
|
<property name="frameShadow">
|
||||||
<enum>QFrame::Plain</enum>
|
<enum>QFrame::Plain</enum>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="lineWidth">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
@@ -470,6 +473,9 @@
|
|||||||
<property name="frameShadow">
|
<property name="frameShadow">
|
||||||
<enum>QFrame::Plain</enum>
|
<enum>QFrame::Plain</enum>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="lineWidth">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
|
|||||||
@@ -54,6 +54,7 @@
|
|||||||
#define GPS
|
#define GPS
|
||||||
#define FAI_CHOICE
|
#define FAI_CHOICE
|
||||||
|
|
||||||
|
#define NUM_POTS 3
|
||||||
#define EEPROM_VARIANT 3
|
#define EEPROM_VARIANT 3
|
||||||
|
|
||||||
#undef min
|
#undef min
|
||||||
|
|||||||
@@ -54,6 +54,8 @@
|
|||||||
#define LUA_MODEL_SCRIPTS
|
#define LUA_MODEL_SCRIPTS
|
||||||
#define EEPROM_VARIANT 3
|
#define EEPROM_VARIANT 3
|
||||||
|
|
||||||
|
#define NUM_POTS 5
|
||||||
|
|
||||||
#undef min
|
#undef min
|
||||||
#undef max
|
#undef max
|
||||||
|
|
||||||
@@ -152,9 +154,6 @@ int16_t g_anas[NUM_STICKS+5];
|
|||||||
|
|
||||||
uint16_t anaIn(uint8_t chan)
|
uint16_t anaIn(uint8_t chan)
|
||||||
{
|
{
|
||||||
if (chan == 8)
|
|
||||||
return 1800;
|
|
||||||
else
|
|
||||||
return g_anas[chan];
|
return g_anas[chan];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -53,6 +53,8 @@
|
|||||||
#define EEPROM_VARIANT SIMU_STOCK_VARIANTS
|
#define EEPROM_VARIANT SIMU_STOCK_VARIANTS
|
||||||
#define GAUGES
|
#define GAUGES
|
||||||
|
|
||||||
|
#define NUM_POTS 3
|
||||||
|
|
||||||
#undef min
|
#undef min
|
||||||
#undef max
|
#undef max
|
||||||
|
|
||||||
|
|||||||
@@ -1530,18 +1530,20 @@ MdiChild *MainWindow::createMdiChild()
|
|||||||
return child;
|
return child;
|
||||||
}
|
}
|
||||||
|
|
||||||
QAction * MainWindow::addAct(QString icon, QString sName, QString lName, QKeySequence::StandardKey shortcut, const char *slot)
|
QAction * MainWindow::addAct(QString icon, QString sName, QString lName, QKeySequence::StandardKey shortcut, const char *slot, QObject *slotObj)
|
||||||
{
|
{
|
||||||
QAction * newAction = new QAction( this );
|
QAction * newAction = new QAction( this );
|
||||||
if (!icon.isEmpty())
|
if (!icon.isEmpty())
|
||||||
newAction->setIcon(CompanionIcon(icon));
|
newAction->setIcon(CompanionIcon(icon));
|
||||||
if (!sName.isEmpty())
|
if (!sName.isEmpty())
|
||||||
newAction->setText(sName);
|
newAction->setText(sName);
|
||||||
if (!lName.isEmpty())
|
if (!lName.isEmpty())
|
||||||
newAction->setStatusTip(lName);
|
newAction->setStatusTip(lName);
|
||||||
if (shortcut != 0)
|
if (shortcut != 0)
|
||||||
newAction->setShortcuts(shortcut);
|
newAction->setShortcuts(shortcut);
|
||||||
connect(newAction, SIGNAL(triggered()), this, slot);
|
if (slotObj == NULL)
|
||||||
|
slotObj = this;
|
||||||
|
connect(newAction, SIGNAL(triggered()), slotObj, slot);
|
||||||
return newAction;
|
return newAction;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1584,7 +1586,7 @@ void MainWindow::createActions()
|
|||||||
openAct = addAct("open.png", tr("Open Models+Settings..."), tr("Open Models and Settings file"), QKeySequence::Open, SLOT(openFile()));
|
openAct = addAct("open.png", tr("Open Models+Settings..."), tr("Open Models and Settings file"), QKeySequence::Open, SLOT(openFile()));
|
||||||
saveAct = addAct("save.png", tr("Save Models+Settings..."), tr("Save Models and Settings file"), QKeySequence::Save, SLOT(save()));
|
saveAct = addAct("save.png", tr("Save Models+Settings..."), tr("Save Models and Settings file"), QKeySequence::Save, SLOT(save()));
|
||||||
saveAsAct = addAct("saveas.png", tr("Save Models+Settings as..."), tr("Save Models and Settings file"), QKeySequence::SaveAs, SLOT(saveAs()));
|
saveAsAct = addAct("saveas.png", tr("Save Models+Settings as..."), tr("Save Models and Settings file"), QKeySequence::SaveAs, SLOT(saveAs()));
|
||||||
exitAct = addAct("exit.png", tr("Exit"), tr("Exit the application"), QKeySequence::Quit, SLOT(newFile()));
|
exitAct = addAct("exit.png", tr("Exit"), tr("Exit the application"), QKeySequence::Quit, SLOT(closeAllWindows()), qApp);
|
||||||
cutAct = addAct("cut.png", tr("Cut Model"), tr("Cut current model to the clipboard"), QKeySequence::Cut, SLOT(cut()));
|
cutAct = addAct("cut.png", tr("Cut Model"), tr("Cut current model to the clipboard"), QKeySequence::Cut, SLOT(cut()));
|
||||||
copyAct = addAct("copy.png", tr("Copy Model..."), tr("Copy current model to the clipboard"), QKeySequence::Copy, SLOT(copy()));
|
copyAct = addAct("copy.png", tr("Copy Model..."), tr("Copy current model to the clipboard"), QKeySequence::Copy, SLOT(copy()));
|
||||||
pasteAct = addAct("paste.png", tr("Paste Model..."), tr("Paste model from clipboard"), QKeySequence::Paste, SLOT(paste()));
|
pasteAct = addAct("paste.png", tr("Paste Model..."), tr("Paste model from clipboard"), QKeySequence::Paste, SLOT(paste()));
|
||||||
|
|||||||
@@ -49,7 +49,7 @@
|
|||||||
#include "eeprominterface.h"
|
#include "eeprominterface.h"
|
||||||
|
|
||||||
#define SPLASH_TIME 5
|
#define SPLASH_TIME 5
|
||||||
#define MAX_RECENT 10
|
#define MAX_RECENT 15
|
||||||
#define MAX_PROFILES 15
|
#define MAX_PROFILES 15
|
||||||
|
|
||||||
class MdiChild;
|
class MdiChild;
|
||||||
@@ -158,7 +158,7 @@ private slots:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
void createActions();
|
void createActions();
|
||||||
QAction * addAct(QString, QString, QString, QKeySequence::StandardKey, const char *);
|
QAction * addAct(QString, QString, QString, QKeySequence::StandardKey, const char *, QObject *slotObj=NULL);
|
||||||
QAction * addAct(QActionGroup *, QString, QString, const char *);
|
QAction * addAct(QActionGroup *, QString, QString, const char *);
|
||||||
QAction * addAct(QString, QString, QString, const char *);
|
QAction * addAct(QString, QString, QString, const char *);
|
||||||
|
|
||||||
|
|||||||
@@ -161,6 +161,12 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
|
|||||||
connect(fswtchParamArmT[i], SIGNAL(editTextChanged ( const QString)), this, SLOT(customFunctionEdited()));
|
connect(fswtchParamArmT[i], SIGNAL(editTextChanged ( const QString)), this, SLOT(customFunctionEdited()));
|
||||||
|
|
||||||
#ifdef PHONON
|
#ifdef PHONON
|
||||||
|
phononLock=false;
|
||||||
|
clickObject = new Phonon::MediaObject(this);
|
||||||
|
clickOutput = new Phonon::AudioOutput(Phonon::NoCategory, this);
|
||||||
|
Phonon::createPath(clickObject, clickOutput);
|
||||||
|
connect(clickObject, SIGNAL(stateChanged(Phonon::State,Phonon::State)), this, SLOT(mediaPlayer_state(Phonon::State,Phonon::State)));
|
||||||
|
|
||||||
playBT[i] = new QPushButton(this);
|
playBT[i] = new QPushButton(this);
|
||||||
playBT[i]->setProperty("index", i);
|
playBT[i]->setProperty("index", i);
|
||||||
playBT[i]->setProperty("state", "play");
|
playBT[i]->setProperty("state", "play");
|
||||||
@@ -203,6 +209,7 @@ void CustomFunctionsPanel::mediaPlayer_state(Phonon::State newState, Phonon::Sta
|
|||||||
clickObject->clearQueue();
|
clickObject->clearQueue();
|
||||||
clickObject->clear();
|
clickObject->clear();
|
||||||
for (int i=0; i<GetEepromInterface()->getCapability(CustomFunctions); i++) {
|
for (int i=0; i<GetEepromInterface()->getCapability(CustomFunctions); i++) {
|
||||||
|
playBT[i]->setProperty("state", "play");
|
||||||
playBT[i]->setObjectName(QString("play_%1").arg(i));
|
playBT[i]->setObjectName(QString("play_%1").arg(i));
|
||||||
playBT[i]->setIcon(CompanionIcon("play.png"));
|
playBT[i]->setIcon(CompanionIcon("play.png"));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,11 +3,12 @@
|
|||||||
#include "eeprominterface.h"
|
#include "eeprominterface.h"
|
||||||
#include "helpers.h"
|
#include "helpers.h"
|
||||||
|
|
||||||
ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, int stickMode) :
|
ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, int stickMode, char * inputName) :
|
||||||
QDialog(parent),
|
QDialog(parent),
|
||||||
ui(new Ui::ExpoDialog),
|
ui(new Ui::ExpoDialog),
|
||||||
model(model),
|
model(model),
|
||||||
ed(expoData)
|
ed(expoData),
|
||||||
|
inputName(inputName)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
QLabel * lb_fp[] = {ui->lb_FP0,ui->lb_FP1,ui->lb_FP2,ui->lb_FP3,ui->lb_FP4,ui->lb_FP5,ui->lb_FP6,ui->lb_FP7,ui->lb_FP8 };
|
QLabel * lb_fp[] = {ui->lb_FP0,ui->lb_FP1,ui->lb_FP2,ui->lb_FP3,ui->lb_FP4,ui->lb_FP5,ui->lb_FP6,ui->lb_FP7,ui->lb_FP8 };
|
||||||
@@ -76,7 +77,7 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, i
|
|||||||
}
|
}
|
||||||
|
|
||||||
ui->inputName->setValidator(new QRegExpValidator(rx, this));
|
ui->inputName->setValidator(new QRegExpValidator(rx, this));
|
||||||
ui->inputName->setText(model.inputNames[ed->chn]);
|
ui->inputName->setText(inputName);
|
||||||
|
|
||||||
ui->lineName->setValidator(new QRegExpValidator(rx, this));
|
ui->lineName->setValidator(new QRegExpValidator(rx, this));
|
||||||
ui->lineName->setText(ed->name);
|
ui->lineName->setText(ed->name);
|
||||||
@@ -93,6 +94,8 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, i
|
|||||||
for (int i=0; i<9; i++) {
|
for (int i=0; i<9; i++) {
|
||||||
connect(cb_fp[i], SIGNAL(toggled(bool)), this, SLOT(valuesChanged()));
|
connect(cb_fp[i], SIGNAL(toggled(bool)), this, SLOT(valuesChanged()));
|
||||||
}
|
}
|
||||||
|
if (GetEepromInterface()->getCapability(VirtualInputs))
|
||||||
|
connect(ui->inputName, SIGNAL(editingFinished()), this, SLOT(valuesChanged()));
|
||||||
QTimer::singleShot(0, this, SLOT(shrink()));
|
QTimer::singleShot(0, this, SLOT(shrink()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -137,7 +140,7 @@ void ExpoDialog::valuesChanged()
|
|||||||
ed->mode = ui->sideCB->currentIndex() + 1;
|
ed->mode = ui->sideCB->currentIndex() + 1;
|
||||||
|
|
||||||
strcpy(ed->name, ui->lineName->text().toAscii().data());
|
strcpy(ed->name, ui->lineName->text().toAscii().data());
|
||||||
strcpy(model.inputNames[ed->chn], ui->inputName->text().toAscii().data());
|
strcpy(inputName, ui->inputName->text().toAscii().data());
|
||||||
|
|
||||||
ed->phases=0;
|
ed->phases=0;
|
||||||
for (int i=8; i>=0 ; i--) {
|
for (int i=8; i>=0 ; i--) {
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ namespace Ui {
|
|||||||
class ExpoDialog : public QDialog {
|
class ExpoDialog : public QDialog {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expodata, int stickMode);
|
ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expodata, int stickMode, char * inputName);
|
||||||
~ExpoDialog();
|
~ExpoDialog();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@@ -28,6 +28,7 @@ class ExpoDialog : public QDialog {
|
|||||||
Ui::ExpoDialog * ui;
|
Ui::ExpoDialog * ui;
|
||||||
ModelData & model;
|
ModelData & model;
|
||||||
ExpoData * ed;
|
ExpoData * ed;
|
||||||
|
char * inputName;
|
||||||
GVarGroup * gvGroup;
|
GVarGroup * gvGroup;
|
||||||
CurveGroup * curveGroup;
|
CurveGroup * curveGroup;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -169,12 +169,18 @@ void InputsPanel::gm_openExpo(int index)
|
|||||||
if(index<0 || index>=C9X_MAX_EXPOS) return;
|
if(index<0 || index>=C9X_MAX_EXPOS) return;
|
||||||
|
|
||||||
ExpoData mixd(model.expoData[index]);
|
ExpoData mixd(model.expoData[index]);
|
||||||
|
char inputName[4+1];
|
||||||
emit modified();
|
emit modified();
|
||||||
update();
|
update();
|
||||||
|
|
||||||
|
if (GetEepromInterface()->getCapability(VirtualInputs))
|
||||||
|
strcpy(inputName, model.inputNames[mixd.chn]);
|
||||||
|
|
||||||
ExpoDialog *g = new ExpoDialog(this, model, &mixd, generalSettings.stickMode);
|
ExpoDialog *g = new ExpoDialog(this, model, &mixd, generalSettings.stickMode, inputName);
|
||||||
if (g->exec()) {
|
if (g->exec()) {
|
||||||
model.expoData[index] = mixd;
|
model.expoData[index] = mixd;
|
||||||
|
if (GetEepromInterface()->getCapability(VirtualInputs))
|
||||||
|
strcpy(model.inputNames[mixd.chn], inputName);
|
||||||
emit modified();
|
emit modified();
|
||||||
update();
|
update();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,10 +28,20 @@ TelemetryAnalog::TelemetryAnalog(QWidget *parent, FrSkyChannelData & analog):
|
|||||||
update();
|
update();
|
||||||
|
|
||||||
ui->UnitCB->setCurrentIndex(analog.type);
|
ui->UnitCB->setCurrentIndex(analog.type);
|
||||||
ui->alarm1LevelCB->setCurrentIndex(analog.alarms[0].level);
|
if (!IS_TARANIS(GetEepromInterface()->getBoard())) {
|
||||||
ui->alarm1GreaterCB->setCurrentIndex(analog.alarms[0].greater);
|
ui->alarm1LevelCB->setCurrentIndex(analog.alarms[0].level);
|
||||||
ui->alarm2LevelCB->setCurrentIndex(analog.alarms[1].level);
|
ui->alarm1GreaterCB->setCurrentIndex(analog.alarms[0].greater);
|
||||||
ui->alarm2GreaterCB->setCurrentIndex(analog.alarms[1].greater);
|
ui->alarm2LevelCB->setCurrentIndex(analog.alarms[1].level);
|
||||||
|
ui->alarm2GreaterCB->setCurrentIndex(analog.alarms[1].greater);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
ui->alarm1LevelCB->hide();
|
||||||
|
ui->alarm2LevelCB->hide();
|
||||||
|
ui->alarm1GreaterCB->hide();
|
||||||
|
ui->alarm2GreaterCB->hide();
|
||||||
|
ui->alarm1Label->setText(tr("Low Alarm"));
|
||||||
|
ui->alarm2Label->setText(tr("Critical Alarm"));
|
||||||
|
}
|
||||||
|
|
||||||
if (!(GetEepromInterface()->getCapability(Telemetry) & TM_HASOFFSET)) {
|
if (!(GetEepromInterface()->getCapability(Telemetry) & TM_HASOFFSET)) {
|
||||||
ui->CalibSB->hide();
|
ui->CalibSB->hide();
|
||||||
@@ -467,8 +477,16 @@ void TelemetryPanel::setup()
|
|||||||
}
|
}
|
||||||
ui->rssiAlarm1SB->setValue(model.frsky.rssiAlarms[0].value);
|
ui->rssiAlarm1SB->setValue(model.frsky.rssiAlarms[0].value);
|
||||||
ui->rssiAlarm2SB->setValue(model.frsky.rssiAlarms[1].value);
|
ui->rssiAlarm2SB->setValue(model.frsky.rssiAlarms[1].value);
|
||||||
ui->rssiAlarm1CB->setCurrentIndex(model.frsky.rssiAlarms[0].level);
|
if (!IS_TARANIS(GetEepromInterface()->getBoard())) {
|
||||||
ui->rssiAlarm2CB->setCurrentIndex(model.frsky.rssiAlarms[1].level);
|
ui->rssiAlarm1CB->setCurrentIndex(model.frsky.rssiAlarms[0].level);
|
||||||
|
ui->rssiAlarm2CB->setCurrentIndex(model.frsky.rssiAlarms[1].level);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
ui->rssiAlarm1CB->hide();
|
||||||
|
ui->rssiAlarm2CB->hide();
|
||||||
|
ui->rssiAlarm1Label->setText(tr("Low Alarm"));
|
||||||
|
ui->rssiAlarm2Label->setText(tr("Critical Alarm"));
|
||||||
|
}
|
||||||
|
|
||||||
if (!GetEepromInterface()->getCapability(HasAltitudeSel)) {
|
if (!GetEepromInterface()->getCapability(HasAltitudeSel)) {
|
||||||
ui->AltitudeGPS_ChkB->hide();
|
ui->AltitudeGPS_ChkB->hide();
|
||||||
|
|||||||
@@ -77,7 +77,7 @@
|
|||||||
</property>
|
</property>
|
||||||
<layout class="QGridLayout" name="gridLayout_7">
|
<layout class="QGridLayout" name="gridLayout_7">
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QLabel" name="label_927">
|
<widget class="QLabel" name="rssiAlarm1Label">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
|
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
|
||||||
<horstretch>0</horstretch>
|
<horstretch>0</horstretch>
|
||||||
@@ -157,7 +157,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="0">
|
<item row="1" column="0">
|
||||||
<widget class="QLabel" name="label_928">
|
<widget class="QLabel" name="rssiAlarm2Label">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
|
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
|
||||||
<horstretch>0</horstretch>
|
<horstretch>0</horstretch>
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="0">
|
<item row="2" column="0">
|
||||||
<widget class="QLabel" name="label_919">
|
<widget class="QLabel" name="alarm1Label">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
|
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
|
||||||
<horstretch>0</horstretch>
|
<horstretch>0</horstretch>
|
||||||
@@ -106,7 +106,7 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="3" column="0">
|
<item row="3" column="0">
|
||||||
<widget class="QLabel" name="label_921">
|
<widget class="QLabel" name="alarm2Label">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
|
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
|
||||||
<horstretch>0</horstretch>
|
<horstretch>0</horstretch>
|
||||||
|
|||||||
@@ -530,9 +530,9 @@ void printDialog::printCurves()
|
|||||||
qplot_color[7]=new QColor(0,0,255);
|
qplot_color[7]=new QColor(0,0,255);
|
||||||
qplot_color[8]=new QColor(0,127,255);
|
qplot_color[8]=new QColor(0,127,255);
|
||||||
qplot_color[9]=new QColor(127,0,255);
|
qplot_color[9]=new QColor(127,0,255);
|
||||||
qplot_color[10]=new QColor(0,255,0);
|
qplot_color[10]=new QColor(0,200,0);
|
||||||
qplot_color[11]=new QColor(0,255,127);
|
qplot_color[11]=new QColor(0,200,127);
|
||||||
qplot_color[12]=new QColor(127,255,0);
|
qplot_color[12]=new QColor(127,200,0);
|
||||||
qplot_color[13]=new QColor(255,0,0);
|
qplot_color[13]=new QColor(255,0,0);
|
||||||
qplot_color[14]=new QColor(255,0,127);
|
qplot_color[14]=new QColor(255,0,127);
|
||||||
qplot_color[15]=new QColor(255,127,0);
|
qplot_color[15]=new QColor(255,127,0);
|
||||||
|
|||||||
@@ -515,6 +515,7 @@ void SimulatorDialogTaranis::getValues()
|
|||||||
{
|
{
|
||||||
-ui->dialP_1->value(),
|
-ui->dialP_1->value(),
|
||||||
ui->dialP_2->value(),
|
ui->dialP_2->value(),
|
||||||
|
0,
|
||||||
-ui->dialP_3->value(),
|
-ui->dialP_3->value(),
|
||||||
ui->dialP_4->value()
|
ui->dialP_4->value()
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
struct TxInputs {
|
struct TxInputs {
|
||||||
int sticks[NUM_STICKS]; /* lh lv rv rh */
|
int sticks[NUM_STICKS]; /* lh lv rv rh */
|
||||||
int pots[4]; /* TODO NUM_POTS */
|
int pots[5]; /* TODO NUM_POTS */
|
||||||
int switches[10]; /* TODO NUM_SWITCHES */
|
int switches[10]; /* TODO NUM_SWITCHES */
|
||||||
bool keys[6]; /* TODO NUM_KEYS */
|
bool keys[6]; /* TODO NUM_KEYS */
|
||||||
bool rotenc;
|
bool rotenc;
|
||||||
|
|||||||
+5164
-7772
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -109,11 +109,18 @@ Section "OpenTX companion" SecDummy
|
|||||||
${registerExtension} "$INSTDIR\companion.exe" ".hex" "HEX_File"
|
${registerExtension} "$INSTDIR\companion.exe" ".hex" "HEX_File"
|
||||||
${registerExtension} "$INSTDIR\companion.exe" ".companion" "EEPE_File"
|
${registerExtension} "$INSTDIR\companion.exe" ".companion" "EEPE_File"
|
||||||
${registerExtension} "$INSTDIR\companion.exe" ".eepm" "EEPM_File"
|
${registerExtension} "$INSTDIR\companion.exe" ".eepm" "EEPM_File"
|
||||||
|
|
||||||
|
|
||||||
;Create uninstaller
|
;Create uninstaller
|
||||||
WriteUninstaller "$INSTDIR\Uninstall.exe"
|
WriteUninstaller "$INSTDIR\Uninstall.exe"
|
||||||
|
|
||||||
|
;Registry information for add/remove programs
|
||||||
|
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "DisplayName" "OpenTX Companion"
|
||||||
|
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "UninstallString" "$\"$INSTDIR\Uninstall.exe$\""
|
||||||
|
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "DisplayIcon" "$\"$INSTDIR\companion.exe$\""
|
||||||
|
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "Publisher" "OpenTX"
|
||||||
|
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "URLInfoAbout" "http://www.open-tx.org"
|
||||||
|
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ImageMaker" "QuietUninstallString" "$\"$INSTDIR\Uninstall.exe$\" /S"
|
||||||
|
|
||||||
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
|
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
|
||||||
|
|
||||||
;Create shortcuts
|
;Create shortcuts
|
||||||
@@ -178,6 +185,7 @@ Section "Uninstall"
|
|||||||
RMDir "$SMPROGRAMS\$StartMenuFolder"
|
RMDir "$SMPROGRAMS\$StartMenuFolder"
|
||||||
|
|
||||||
DeleteRegKey /ifempty HKCU "Software\companion9x"
|
DeleteRegKey /ifempty HKCU "Software\companion9x"
|
||||||
|
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX"
|
||||||
|
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
|
|||||||
@@ -12,14 +12,14 @@
|
|||||||
;General
|
;General
|
||||||
|
|
||||||
;Name and file
|
;Name and file
|
||||||
Name "OpenTX companion"
|
Name "OpenTX Companion"
|
||||||
OutFile "companionInstall_v@C9X_VERSION@.exe"
|
OutFile "companionInstall_v@C9X_VERSION@.exe"
|
||||||
|
|
||||||
;Default installation folder
|
;Default installation folder
|
||||||
InstallDir "$PROGRAMFILES\OpenTX companion"
|
InstallDir "$PROGRAMFILES\OpenTX"
|
||||||
|
|
||||||
;Get installation folder from registry if available
|
;Get installation folder from registry if available
|
||||||
InstallDirRegKey HKCU "Software\companion9x" ""
|
InstallDirRegKey HKCU "Software\OpenTX" ""
|
||||||
|
|
||||||
;Compressor options
|
;Compressor options
|
||||||
SetCompressor /FINAL /SOLID lzma
|
SetCompressor /FINAL /SOLID lzma
|
||||||
@@ -66,7 +66,7 @@
|
|||||||
|
|
||||||
;Start Menu Folder Page Configuration
|
;Start Menu Folder Page Configuration
|
||||||
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
|
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
|
||||||
!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\companion9x"
|
!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\OpenTX"
|
||||||
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
|
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
|
||||||
|
|
||||||
!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
|
!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
|
||||||
@@ -77,7 +77,7 @@
|
|||||||
!define MUI_FINISHPAGE_NOAUTOCLOSE
|
!define MUI_FINISHPAGE_NOAUTOCLOSE
|
||||||
!define MUI_FINISHPAGE_RUN
|
!define MUI_FINISHPAGE_RUN
|
||||||
!define MUI_FINISHPAGE_RUN_CHECKED
|
!define MUI_FINISHPAGE_RUN_CHECKED
|
||||||
!define MUI_FINISHPAGE_RUN_TEXT "Launch companion"
|
!define MUI_FINISHPAGE_RUN_TEXT "Launch OpenTX Companion"
|
||||||
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
|
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
|
||||||
# !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
|
# !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
|
||||||
# !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt
|
# !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt
|
||||||
@@ -95,7 +95,7 @@
|
|||||||
;--------------------------------
|
;--------------------------------
|
||||||
;Installer Sections
|
;Installer Sections
|
||||||
|
|
||||||
Section "OpenTX companion" SecDummy
|
Section "OpenTX Companion" SecDummy
|
||||||
|
|
||||||
SetOutPath "$INSTDIR"
|
SetOutPath "$INSTDIR"
|
||||||
|
|
||||||
@@ -129,7 +129,7 @@ Section "OpenTX companion" SecDummy
|
|||||||
|
|
||||||
SetOutPath "$INSTDIR"
|
SetOutPath "$INSTDIR"
|
||||||
;Store installation folder
|
;Store installation folder
|
||||||
WriteRegStr HKCU "Software\companion9x" "" $INSTDIR
|
WriteRegStr HKCU "Software\OpenTX" "" $INSTDIR
|
||||||
|
|
||||||
;Associate with extentions ,bin and .hex
|
;Associate with extentions ,bin and .hex
|
||||||
${registerExtension} "$INSTDIR\companion.exe" ".bin" "BIN_File"
|
${registerExtension} "$INSTDIR\companion.exe" ".bin" "BIN_File"
|
||||||
@@ -141,6 +141,14 @@ Section "OpenTX companion" SecDummy
|
|||||||
;Create uninstaller
|
;Create uninstaller
|
||||||
WriteUninstaller "$INSTDIR\Uninstall.exe"
|
WriteUninstaller "$INSTDIR\Uninstall.exe"
|
||||||
|
|
||||||
|
;Registry information for add/remove programs
|
||||||
|
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "DisplayName" "OpenTX Companion"
|
||||||
|
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "UninstallString" "$\"$INSTDIR\Uninstall.exe$\""
|
||||||
|
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "DisplayIcon" "$\"$INSTDIR\companion.exe$\""
|
||||||
|
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "Publisher" "OpenTX"
|
||||||
|
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "URLInfoAbout" "http://www.open-tx.org"
|
||||||
|
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ImageMaker" "QuietUninstallString" "$\"$INSTDIR\Uninstall.exe$\" /S"
|
||||||
|
|
||||||
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
|
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
|
||||||
|
|
||||||
;Create shortcuts
|
;Create shortcuts
|
||||||
@@ -207,7 +215,8 @@ Section "Uninstall"
|
|||||||
Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk"
|
Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk"
|
||||||
RMDir "$SMPROGRAMS\$StartMenuFolder"
|
RMDir "$SMPROGRAMS\$StartMenuFolder"
|
||||||
|
|
||||||
DeleteRegKey /ifempty HKCU "Software\companion9x"
|
DeleteRegKey /ifempty HKCU "Software\OpenTX"
|
||||||
|
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX"
|
||||||
|
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
Copyright © 2011-2013 Bertrand Songis and Romolo Manfredini
|
Copyright © 2011-2014 OpenTX team
|
||||||
|
|
||||||
companion9x is based on code named eePe by author - Erez Raviv <erezraviv@gmail.com>
|
OpenTX Companion is based on code named eePe by author - Erez Raviv <erezraviv@gmail.com>
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
|
This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -272,7 +272,7 @@ MENUS_LOCK == NO
|
|||||||
SHELL = sh
|
SHELL = sh
|
||||||
IMG2LBM = -python ../util/img2lbm.py
|
IMG2LBM = -python ../util/img2lbm.py
|
||||||
TRANSLATE = -python ../util/translate.py
|
TRANSLATE = -python ../util/translate.py
|
||||||
VERSION = 2.0
|
VERSION = 1.99
|
||||||
|
|
||||||
SRC =
|
SRC =
|
||||||
CPPSRC =
|
CPPSRC =
|
||||||
|
|||||||
+12
-6
@@ -1112,12 +1112,18 @@ enum FrskyUsrProtocols {
|
|||||||
USR_PROTO_LAST = USR_PROTO_WS_HOW_HIGH,
|
USR_PROTO_LAST = USR_PROTO_WS_HOW_HIGH,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum FrskySource {
|
enum FrskyCurrentSource {
|
||||||
FRSKY_SOURCE_NONE,
|
FRSKY_CURRENT_SOURCE_NONE,
|
||||||
FRSKY_SOURCE_A1,
|
FRSKY_CURRENT_SOURCE_A1,
|
||||||
FRSKY_SOURCE_A2,
|
FRSKY_CURRENT_SOURCE_A2,
|
||||||
FRSKY_SOURCE_FAS,
|
FRSKY_CURRENT_SOURCE_FAS,
|
||||||
FRSKY_SOURCE_CELLS,
|
};
|
||||||
|
|
||||||
|
enum FrskyVoltsSource {
|
||||||
|
FRSKY_VOLTS_SOURCE_A1,
|
||||||
|
FRSKY_VOLTS_SOURCE_A2,
|
||||||
|
FRSKY_VOLTS_SOURCE_FAS,
|
||||||
|
FRSKY_VOLTS_SOURCE_CELLS,
|
||||||
};
|
};
|
||||||
|
|
||||||
#if defined(CPUARM)
|
#if defined(CPUARM)
|
||||||
|
|||||||
@@ -723,7 +723,7 @@ void telemetryInterrupt10ms()
|
|||||||
uint16_t current = 0;
|
uint16_t current = 0;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
channel = g_model.frsky.currentSource - FRSKY_SOURCE_A1;
|
channel = g_model.frsky.currentSource - FRSKY_CURRENT_SOURCE_A1;
|
||||||
if (channel <= 1) {
|
if (channel <= 1) {
|
||||||
current = applyChannelRatio(channel, frskyData.analog[channel].value) / 10;
|
current = applyChannelRatio(channel, frskyData.analog[channel].value) / 10;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -595,7 +595,7 @@ void telemetryInterrupt10ms()
|
|||||||
uint16_t current = 0;
|
uint16_t current = 0;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
channel = g_model.frsky.currentSource - FRSKY_SOURCE_A1;
|
channel = g_model.frsky.currentSource - FRSKY_CURRENT_SOURCE_A1;
|
||||||
if (channel <= 1) {
|
if (channel <= 1) {
|
||||||
current = applyChannelRatio(channel, frskyData.analog[channel].value) / 10;
|
current = applyChannelRatio(channel, frskyData.analog[channel].value) / 10;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -319,8 +319,8 @@
|
|||||||
#define LEN_VTELPROTO "\007"
|
#define LEN_VTELPROTO "\007"
|
||||||
#define TR_VTELPROTO "None\0 ""Hub\0 ""WSHHigh"
|
#define TR_VTELPROTO "None\0 ""Hub\0 ""WSHHigh"
|
||||||
|
|
||||||
#define LEN_VOLTSRC "\003"
|
#define LEN_VOLTSRC TR("\003", "\007")
|
||||||
#define TR_VOLTSRC "---""A1\0""A2\0""FAS""Cel"
|
#define TR_VOLTSRC TR("---""A1\0""A2\0""FAS""Cel", "---\0 ""A1\0 ""A2\0 ""FAS\0 ""Cells\0 ")
|
||||||
|
|
||||||
#define LEN_VARIOSRC "\004"
|
#define LEN_VARIOSRC "\004"
|
||||||
#if defined(FRSKY_SPORT)
|
#if defined(FRSKY_SPORT)
|
||||||
|
|||||||
@@ -42,16 +42,16 @@
|
|||||||
|
|
||||||
// NON ZERO TERMINATED STRINGS
|
// NON ZERO TERMINATED STRINGS
|
||||||
#define LEN_OFFON "\003"
|
#define LEN_OFFON "\003"
|
||||||
#define TR_OFFON "OFF""ON\0"
|
#define TR_OFFON "POI""PÄÄ"
|
||||||
|
|
||||||
#define LEN_MMMINV "\003"
|
#define LEN_MMMINV "\003"
|
||||||
#define TR_MMMINV "---""INV"
|
#define TR_MMMINV "---""KÄÄ"
|
||||||
|
|
||||||
#define LEN_NCHANNELS "\004"
|
#define LEN_NCHANNELS "\004"
|
||||||
#define TR_NCHANNELS "\0014CH\0016CH\0018CH10CH12CH14CH16CH"
|
#define TR_NCHANNELS "\0014CH\0016CH\0018CH10CH12CH14CH16CH"
|
||||||
|
|
||||||
#define LEN_VBEEPMODE "\005"
|
#define LEN_VBEEPMODE "\005"
|
||||||
#define TR_VBEEPMODE "Quiet""Alarm""NoKey""All "
|
#define TR_VBEEPMODE "Äänet""Hälyt""EiNap""Kaikk"
|
||||||
|
|
||||||
#define LEN_VBEEPLEN "\005"
|
#define LEN_VBEEPLEN "\005"
|
||||||
#define TR_VBEEPLEN "0====""=0===""==0==""===0=""====0"
|
#define TR_VBEEPLEN "0====""=0===""==0==""===0=""====0"
|
||||||
@@ -69,22 +69,22 @@
|
|||||||
#define TR_TRNCHN "CH1CH2CH3CH4"
|
#define TR_TRNCHN "CH1CH2CH3CH4"
|
||||||
|
|
||||||
#define LEN_UART3MODES "\017"
|
#define LEN_UART3MODES "\017"
|
||||||
#define TR_UART3MODES "OFF\0 ""S-Port Mirror\0 ""Debug\0 "
|
#define TR_UART3MODES "POIS\0 ""S-Port Pelik\0 ""Debug\0 "
|
||||||
|
|
||||||
#define LEN_POTTYPES "\017"
|
#define LEN_POTTYPES "\017"
|
||||||
#define TR_POTTYPES "None\0 ""Pot\0 ""Multipos Switch"
|
#define TR_POTTYPES "None\0 ""Potikka\0 ""Monias. Kytkin\0"
|
||||||
|
|
||||||
#define LEN_DATETIME "\005"
|
#define LEN_DATETIME "\005"
|
||||||
#define TR_DATETIME "DATE:""TIME:"
|
#define TR_DATETIME "PÄIV:""AIKA:"
|
||||||
|
|
||||||
#define LEN_VLCD "\006"
|
#define LEN_VLCD "\006"
|
||||||
#define TR_VLCD "NormalOptrex"
|
#define TR_VLCD "NormalOptrex"
|
||||||
|
|
||||||
#define LEN_COUNTRYCODES TR("\002", "\007")
|
#define LEN_COUNTRYCODES TR("\002", "\007")
|
||||||
#define TR_COUNTRYCODES TR("US""JP""EU", "America""Japan\0 ""Europe\0")
|
#define TR_COUNTRYCODES TR("US""JP""EU", "Amerikk""Japani\0""Euroopp")
|
||||||
|
|
||||||
#define LEN_VTRIMINC TR("\006", "\013")
|
#define LEN_VTRIMINC TR("\006", "\013")
|
||||||
#define TR_VTRIMINC TR("Expo\0 ""ExFine""Fine\0 ""Medium""Coarse", "Exponential""Extra Fine\0""Fine\0 ""Medium\0 ""Coarse\0 ")
|
#define TR_VTRIMINC TR("Expo\0 ""EriHie""Hieno\0""Keski\0""Karkea", "Exponential""Eri Hieno\0 ""Hieno\0 ""Keski\0 ""Karkea\0 ")
|
||||||
|
|
||||||
#define LEN_VBEEPCOUNTDOWN "\006"
|
#define LEN_VBEEPCOUNTDOWN "\006"
|
||||||
#define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voice\0"
|
#define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voice\0"
|
||||||
@@ -799,18 +799,18 @@
|
|||||||
#define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)"
|
#define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)"
|
||||||
#define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)"
|
#define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)"
|
||||||
|
|
||||||
#define TR_CHR_SHORT 's'
|
#define TR_CHR_SHORT 's'
|
||||||
#define TR_CHR_LONG 'l'
|
#define TR_CHR_LONG 'l'
|
||||||
#define TR_CHR_TOGGLE 't'
|
#define TR_CHR_TOGGLE 't'
|
||||||
#define TR_CHR_HOUR 'h'
|
#define TR_CHR_HOUR 'h'
|
||||||
#define TR_CHR_INPUT 'I' // Values between A-I will work
|
#define TR_CHR_INPUT 'I' // Values between A-I will work
|
||||||
|
|
||||||
#define TR_BEEP_VOLUME "Beep Volume"
|
#define TR_BEEP_VOLUME "Piip Voim"
|
||||||
#define TR_WAV_VOLUME "Wav Volume"
|
#define TR_WAV_VOLUME "Wav Voim"
|
||||||
#define TR_VARIO_VOLUME "Vario Volume"
|
#define TR_VARIO_VOLUME "Variom Voim"
|
||||||
#define TR_BG_VOLUME "Bg Volume"
|
#define TR_BG_VOLUME "Tausta Voim"
|
||||||
|
|
||||||
#define TR_TOP_BAR "Top Bar"
|
#define TR_TOP_BAR "Ylä palkki"
|
||||||
#define TR_ALTITUDE INDENT "Altitude"
|
#define TR_ALTITUDE INDENT "Korkeus"
|
||||||
#define TR_MODS_FORBIDDEN "Modifications forbidden!"
|
#define TR_MODS_FORBIDDEN "Muutokset kielletty!"
|
||||||
#define TR_UNLOCKED "Unlocked"
|
#define TR_UNLOCKED "Avattu"
|
||||||
|
|||||||
@@ -72,7 +72,7 @@
|
|||||||
#define TR_UART3MODES "Av\0 ""Spegling av S-Port""Debug\0 "
|
#define TR_UART3MODES "Av\0 ""Spegling av S-Port""Debug\0 "
|
||||||
|
|
||||||
#define LEN_POTTYPES "\020"
|
#define LEN_POTTYPES "\020"
|
||||||
#define TR_POTTYPES "None\0 ""Potentiometer\0 ""Flerlägesväljare"
|
#define TR_POTTYPES "Ingen\0 ""Potentiometer\0 ""Flerlägesväljare"
|
||||||
|
|
||||||
#define LEN_DATETIME "\005"
|
#define LEN_DATETIME "\005"
|
||||||
#define TR_DATETIME "DAG: ""TID: "
|
#define TR_DATETIME "DAG: ""TID: "
|
||||||
@@ -168,7 +168,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CPUARM)
|
#if defined(CPUARM)
|
||||||
#define TR_CSWEQUAL "a=x\0 "
|
#define TR_CSWEQUAL "a=x\0 "
|
||||||
#else
|
#else
|
||||||
#define TR_CSWEQUAL
|
#define TR_CSWEQUAL
|
||||||
#endif
|
#endif
|
||||||
@@ -223,9 +223,9 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef GVARS
|
#ifdef GVARS
|
||||||
#define TR_ADJUST_GVAR "Justera\0 "
|
#define TR_ADJUST_GVAR "Justera\0 "
|
||||||
#else
|
#else
|
||||||
#define TR_ADJUST_GVAR "[AdjustGV]"
|
#define TR_ADJUST_GVAR "[Just. GV]"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
@@ -512,7 +512,7 @@
|
|||||||
#define TR_THROTTLE_LABEL "Throttle"
|
#define TR_THROTTLE_LABEL "Throttle"
|
||||||
#define TR_THROTTLEREVERSE TR("Revers.Gas", INDENT "Revers.Gas")
|
#define TR_THROTTLEREVERSE TR("Revers.Gas", INDENT "Revers.Gas")
|
||||||
#define TR_MINUTEBEEP INDENT"Minutpip"
|
#define TR_MINUTEBEEP INDENT"Minutpip"
|
||||||
#define TR_BEEPCOUNTDOWN INDENT"Räkna Ned"
|
#define TR_BEEPCOUNTDOWN INDENT"Räkna ned"
|
||||||
#define TR_PERSISTENT TR("Jämt på ",INDENT"Alltid På")
|
#define TR_PERSISTENT TR("Jämt på ",INDENT"Alltid På")
|
||||||
#define TR_BACKLIGHT_LABEL "Belysning"
|
#define TR_BACKLIGHT_LABEL "Belysning"
|
||||||
#define TR_BLDELAY INDENT"Av efter"
|
#define TR_BLDELAY INDENT"Av efter"
|
||||||
@@ -567,40 +567,40 @@
|
|||||||
#define TR_BADEEPROMDATA "Minnet kan inte tolkas"
|
#define TR_BADEEPROMDATA "Minnet kan inte tolkas"
|
||||||
#define TR_EEPROMFORMATTING "Minnet Nollställs"
|
#define TR_EEPROMFORMATTING "Minnet Nollställs"
|
||||||
#define TR_EEPROMOVERFLOW "Minnesfel"
|
#define TR_EEPROMOVERFLOW "Minnesfel"
|
||||||
#define TR_MENURADIOSETUP "Inställningar"
|
#define TR_MENURADIOSETUP "INSTÄLLNINGAR"
|
||||||
#define TR_MENUDATEANDTIME "Dag och Tid"
|
#define TR_MENUDATEANDTIME "DAG OCH TID"
|
||||||
#define TR_MENUTRAINER "Trainer (PPM in)"
|
#define TR_MENUTRAINER "TRAINER (PPM IN)"
|
||||||
#define TR_MENUVERSION "Version"
|
#define TR_MENUVERSION "VERSION"
|
||||||
#define TR_MENUDIAG TR("Brytare","Test av Brytare")
|
#define TR_MENUDIAG TR("BRYTARE","TEST AV BRYTARE")
|
||||||
#define TR_MENUANA "Analoga Värden"
|
#define TR_MENUANA "ANALOGA VÄRDEN"
|
||||||
#define TR_MENUCALIBRATION "Kalibrering"
|
#define TR_MENUCALIBRATION "KALIBRERING"
|
||||||
#define TR_TRIMS2OFFSETS "\004[Spara Trimvärden]"
|
#define TR_TRIMS2OFFSETS "\004[Spara Trimvärden]"
|
||||||
#define TR_MENUMODELSEL TR("Modell","Välj Modell")
|
#define TR_MENUMODELSEL TR("MODELL","VÄLJ MODELL")
|
||||||
#define TR_MENUSETUP TR("Värden","Modellinställningar")
|
#define TR_MENUSETUP TR("VÄRDEN","MODELLINSTÄLLNINGAR")
|
||||||
#define TR_MENUFLIGHTPHASE "Flygläge"
|
#define TR_MENUFLIGHTPHASE "FLYGLÄGE"
|
||||||
#define TR_MENUFLIGHTPHASES "Flyglägen"
|
#define TR_MENUFLIGHTPHASES "FLYGLÄGEN"
|
||||||
#define TR_MENUHELISETUP "Helikopter"
|
#define TR_MENUHELISETUP "HELIKOPTER"
|
||||||
|
|
||||||
#if defined(PCBTARANIS)
|
#if defined(PCBTARANIS)
|
||||||
#define TR_MENUINPUTS TR("Filter","Filtrerad Insignal")
|
#define TR_MENUINPUTS TR("FILTER","FILTRERAD INSIGNAL")
|
||||||
#define TR_MENULIMITS "Gränser"
|
#define TR_MENULIMITS "GRÄNSER"
|
||||||
#elif defined(PPM_CENTER_ADJUSTABLE) || defined(PPM_LIMITS_SYMETRICAL) // The right menu titles for the gurus ...
|
#elif defined(PPM_CENTER_ADJUSTABLE) || defined(PPM_LIMITS_SYMETRICAL) // The right menu titles for the gurus ...
|
||||||
#define TR_MENUINPUTS "Spakar"
|
#define TR_MENUINPUTS "SPAKAR"
|
||||||
#define TR_MENULIMITS "Gränser"
|
#define TR_MENULIMITS "GRÄNSER"
|
||||||
#else
|
#else
|
||||||
#define TR_MENUINPUTS TR("DR/Expo","DualRates/Expo")
|
#define TR_MENUINPUTS TR("DR/EXPO","DUALRATES/EXPO")
|
||||||
#define TR_MENULIMITS "Gränser"
|
#define TR_MENULIMITS "GRÄNSER"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define TR_MENUCURVES "Kurvor"
|
#define TR_MENUCURVES "KURVOR"
|
||||||
#define TR_MENUCURVE "Kurva"
|
#define TR_MENUCURVE "KURVA"
|
||||||
#define TR_MENULOGICALSWITCH "Logisk Brytare"
|
#define TR_MENULOGICALSWITCH "LOGISK BRYTARE"
|
||||||
#define TR_MENULOGICALSWITCHES "Logiska Brytare"
|
#define TR_MENULOGICALSWITCHES "LOGISKA BRYTARE"
|
||||||
#define TR_MENUCUSTOMFUNC "BrytarFunktioner"
|
#define TR_MENUCUSTOMFUNC "BRYTARFUNKTIONER"
|
||||||
#define TR_MENUTELEMETRY "Telemetri"
|
#define TR_MENUTELEMETRY "TELEMETRI"
|
||||||
#define TR_MENUTEMPLATES "Mallar"
|
#define TR_MENUTEMPLATES "MALLAR"
|
||||||
#define TR_MENUSTAT "Statistik"
|
#define TR_MENUSTAT "STATISTIK"
|
||||||
#define TR_MENUDEBUG "Debug"
|
#define TR_MENUDEBUG "DEBUG"
|
||||||
#define TR_RXNUM "RxNum"
|
#define TR_RXNUM "RxNum"
|
||||||
#define TR_SYNCMENU "Synk [MENU]"
|
#define TR_SYNCMENU "Synk [MENU]"
|
||||||
#define TR_LIMIT INDENT"Nivå"
|
#define TR_LIMIT INDENT"Nivå"
|
||||||
@@ -673,7 +673,7 @@
|
|||||||
#define TR_GLOBAL_VARS "Globala Variabler"
|
#define TR_GLOBAL_VARS "Globala Variabler"
|
||||||
#define TR_GLOBAL_V "GLOBAL V."
|
#define TR_GLOBAL_V "GLOBAL V."
|
||||||
#define TR_GLOBAL_VAR "Global Variabel"
|
#define TR_GLOBAL_VAR "Global Variabel"
|
||||||
#define TR_MENUGLOBALVARS "Globala Variabler"
|
#define TR_MENUGLOBALVARS "GLOBALA VARIABLER"
|
||||||
#define TR_OWN "Egen"
|
#define TR_OWN "Egen"
|
||||||
#define TR_DATE "Datum"
|
#define TR_DATE "Datum"
|
||||||
#define TR_ROTARY_ENCODER "R.Enks"
|
#define TR_ROTARY_ENCODER "R.Enks"
|
||||||
@@ -703,7 +703,7 @@
|
|||||||
#define TR_CF "BF"
|
#define TR_CF "BF"
|
||||||
#define TR_SPEAKER INDENT"Högtalare"
|
#define TR_SPEAKER INDENT"Högtalare"
|
||||||
#define TR_BUZZER INDENT"Summer"
|
#define TR_BUZZER INDENT"Summer"
|
||||||
#define TR_BYTES "bytes"
|
#define TR_BYTES "byte"
|
||||||
#define TR_MODULE_BIND "[Bind]"
|
#define TR_MODULE_BIND "[Bind]"
|
||||||
#define TR_MODULE_RANGE "[Testa]"
|
#define TR_MODULE_RANGE "[Testa]"
|
||||||
#define TR_RESET_BTN "[Nollställ]"
|
#define TR_RESET_BTN "[Nollställ]"
|
||||||
@@ -715,16 +715,16 @@
|
|||||||
#define TR_CHANNELRANGE INDENT "Kanalområde"
|
#define TR_CHANNELRANGE INDENT "Kanalområde"
|
||||||
#define TR_LOWALARM INDENT "Låg-alarm"
|
#define TR_LOWALARM INDENT "Låg-alarm"
|
||||||
#define TR_CRITICALALARM INDENT "Kritiskt alarm"
|
#define TR_CRITICALALARM INDENT "Kritiskt alarm"
|
||||||
#define TR_PERSISTENT_MAH INDENT "Store mAh"
|
#define TR_PERSISTENT_MAH INDENT "Lagra mAh"
|
||||||
#define TR_PREFLIGHT "Preflight Checks"
|
#define TR_PREFLIGHT "Preflight Checks"
|
||||||
#define TR_CHECKLIST INDENT "Display Checklist"
|
#define TR_CHECKLIST INDENT "Visa checklisa"
|
||||||
#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset")
|
#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset")
|
||||||
#define TR_UART3MODE "Serieporten"
|
#define TR_UART3MODE "Serieporten"
|
||||||
|
|
||||||
#if defined(MAVLINK)
|
#if defined(MAVLINK)
|
||||||
#define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI"
|
#define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI"
|
||||||
#define TR_MAVLINK_PC_RSSI_EN_LABEL "PC RSSI EN"
|
#define TR_MAVLINK_PC_RSSI_EN_LABEL "PC RSSI EN"
|
||||||
#define TR_MAVMENUSETUP_TITLE "MavlinkInställningar"
|
#define TR_MAVMENUSETUP_TITLE "MAVLINKINSTÄLLNINGAR"
|
||||||
#define TR_MAVLINK_BAUD_LABEL "Baudrate"
|
#define TR_MAVLINK_BAUD_LABEL "Baudrate"
|
||||||
#define TR_MAVLINK_INFOS "INFOS"
|
#define TR_MAVLINK_INFOS "INFOS"
|
||||||
#define TR_MAVLINK_MODE "LÄGE"
|
#define TR_MAVLINK_MODE "LÄGE"
|
||||||
|
|||||||
Reference in New Issue
Block a user