zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge

QGC4.4
lm 15 years ago
parent
739fe5beba fc1eed8e49
commit
f4e7ad378d
4 changed files with 151 additions and 53 deletions
Unified View
  1. 4
      qgroundcontrol.pro
  2. 34
      settings/parameters_alpha.txt
  3. 111
      settings/parameters_bravo_final.txt
  4. 55
      src/ui/MainWindow.ui

4
qgroundcontrol.pro
Unescape View File

@ -18,8 +18,8 @@ TARGET = qgroundcontrol
BASEDIR = . BASEDIR = .
BUILDDIR = build BUILDDIR = build
LANGUAGE = C++ LANGUAGE = C++
CONFIG += debug_and_release \ CONFIG += debug_and_release
console #console
OBJECTS_DIR = $$BUILDDIR/obj OBJECTS_DIR = $$BUILDDIR/obj
MOC_DIR = $$BUILDDIR/moc MOC_DIR = $$BUILDDIR/moc
UI_HEADERS_DIR = src/ui/generated UI_HEADERS_DIR = src/ui/generated

34
settings/parameters_alpha.txt
Unescape View File

@ -1,17 +1,6 @@
# Onboard parameters for system MAV 042 # Onboard parameters for system MAV 042
# #
# MAV ID COMPONENT ID PARAM NAME VALUE (FLOAT) # MAV ID COMPONENT ID PARAM NAME VALUE (FLOAT)
42 1 POSFILTER 1
42 1 PROTOCOLTIMEOUT¶ 2e+06
42 1 SETPOINTDELAY 1e+06
42 1 YAWTOLERANCE 0.1745
42 100 SYS_ID 42
42 120 DOWN_PITCH -0.025
42 120 DOWN_ROLL -0.01
42 120 DOWN_X 0
42 120 DOWN_Y 0
42 120 DOWN_YAW 3.14159
42 120 DOWN_Z 0
42 200 ACC_NAV_OFFS_X 0 42 200 ACC_NAV_OFFS_X 0
42 200 ACC_NAV_OFFS_Y 0 42 200 ACC_NAV_OFFS_Y 0
42 200 ACC_NAV_OFFS_Z -1000 42 200 ACC_NAV_OFFS_Z -1000
@ -23,10 +12,18 @@
42 200 CAL_ACC_X 0 42 200 CAL_ACC_X 0
42 200 CAL_ACC_Y 0 42 200 CAL_ACC_Y 0
42 200 CAL_ACC_Z 0 42 200 CAL_ACC_Z 0
42 200 CAL_GYRO_X 29760 42 200 CAL_FIT_ACTIVE 0
42 200 CAL_GYRO_Y 29860 42 200 CAL_FIT_GYRO_X 31496.8
42 200 CAL_GYRO_Z 29877 42 200 CAL_FIT_GYRO_Y 29383.4
42 200 CAL_TEMP 40 42 200 CAL_FIT_GYRO_Z 30151.1
42 200 CAL_GYRO_X 29826
42 200 CAL_GYRO_Y 30325
42 200 CAL_GYRO_Z 29583
42 200 CAL_MAG_X 0
42 200 CAL_MAG_Y 0
42 200 CAL_MAG_Z 0
42 200 CAL_PRES_DIFF 10000
42 200 CAL_TEMP 32
42 200 CAM_EXP 1000 42 200 CAM_EXP 1000
42 200 CAM_INTERVAL 36000 42 200 CAM_INTERVAL 36000
42 200 DEBUG_1 0 42 200 DEBUG_1 0
@ -35,6 +32,7 @@
42 200 DEBUG_4 0 42 200 DEBUG_4 0
42 200 DEBUG_5 0 42 200 DEBUG_5 0
42 200 DEBUG_6 0 42 200 DEBUG_6 0
42 200 GPS_MODE 0
42 200 MIX_OFFSET 0 42 200 MIX_OFFSET 0
42 200 MIX_POSITION 0 42 200 MIX_POSITION 0
42 200 MIX_POS_YAW 0 42 200 MIX_POS_YAW 0
@ -66,9 +64,9 @@
42 200 PID_YAWSPE_AWU 1 42 200 PID_YAWSPE_AWU 1
42 200 PID_YAWSPE_LIM 50 42 200 PID_YAWSPE_LIM 50
42 200 POS_SP_ACCEPT 1 42 200 POS_SP_ACCEPT 1
42 200 POS_SP_X 1.70917 42 200 POS_SP_X 1.3
42 200 POS_SP_Y 0.479173 42 200 POS_SP_Y 0.7
42 200 POS_SP_YAW 1.5708 42 200 POS_SP_YAW 0
42 200 POS_SP_Z -0.7 42 200 POS_SP_Z -0.7
42 200 POS_TIMEOUT 2e+06 42 200 POS_TIMEOUT 2e+06
42 200 RC_NICK_CHAN 1 42 200 RC_NICK_CHAN 1

111
settings/parameters_bravo_final.txt
Unescape View File

@ -0,0 +1,111 @@
# Onboard parameters for system MAV 042
#
# MAV ID COMPONENT ID PARAM NAME VALUE (FLOAT)
42 1 POSFILTER 1
42 1 PROTOCOLDELAY 40
42 1 PROTOCOLTIMEOUT 2e+06
42 1 SETPOINTDELAY 1e+06
42 1 YAWTOLERANCE 0.1745
42 100 SYS_ID 42
42 120 DOWN_PITCH -0.03
42 120 DOWN_ROLL 0.05
42 120 DOWN_X 0
42 120 DOWN_Y 0
42 120 DOWN_YAW 3.14159
42 120 DOWN_Z -0.088
42 200 ACC_NAV_OFFS_X 0
42 200 ACC_NAV_OFFS_Y 0
42 200 ACC_NAV_OFFS_Z -1000
42 200 ATT_KAL_IYAW 1
42 200 ATT_KAL_KACC 0.0033
42 200 ATT_OFFSET_X 0
42 200 ATT_OFFSET_Y 0
42 200 ATT_OFFSET_Z -0.08
42 200 CAL_ACC_X 0
42 200 CAL_ACC_Y 0
42 200 CAL_ACC_Z 0
42 200 CAL_FIT_ACTIVE 0
42 200 CAL_FIT_GYRO_X 31500
42 200 CAL_FIT_GYRO_Y 29370
42 200 CAL_FIT_GYRO_Z 30230
42 200 CAL_GYRO_X 29812
42 200 CAL_GYRO_Y 29877
42 200 CAL_GYRO_Z 29515
42 200 CAL_MAG_X 0
42 200 CAL_MAG_Y 0
42 200 CAL_MAG_Z 0
42 200 CAL_PRES_DIFF 10000
42 200 CAM_EXP 1000
42 200 CAM_INTERVAL 36000
42 200 DEBUG_1 0
42 200 DEBUG_2 0
42 200 DEBUG_3 0
42 200 DEBUG_4 0
42 200 DEBUG_5 0
42 200 DEBUG_6 0
42 200 GPS_MODE 0
42 200 MIX_OFFSET 0
42 200 MIX_POSITION 0
42 200 MIX_POS_YAW 0
42 200 MIX_REMOTE 0
42 200 MIX_Z_POSITION 0
42 200 PID_ATT_AWU 0.3
42 200 PID_ATT_D 30
42 200 PID_ATT_I 60
42 200 PID_ATT_LIM 100
42 200 PID_ATT_P 90
42 200 PID_POS_AWU 10
42 200 PID_POS_D 1.8
42 200 PID_POS_I 0.25
42 200 PID_POS_LIM 0.15
42 200 PID_POS_P 1.7
42 200 PID_POS_Z_AWU 3
42 200 PID_POS_Z_D 0.15
42 200 PID_POS_Z_I 0.2
42 200 PID_POS_Z_LIM 0.2
42 200 PID_POS_Z_P 0.35
42 200 PID_YAWPOS_AWU 1
42 200 PID_YAWPOS_D 1
42 200 PID_YAWPOS_I 0.1
42 200 PID_YAWPOS_LIM 2
42 200 PID_YAWPOS_P 5
42 200 PID_YAWSPEED_D 0
42 200 PID_YAWSPEED_I 5
42 200 PID_YAWSPEED_P 15
42 200 PID_YAWSPE_AWU 1
42 200 PID_YAWSPE_LIM 20
42 200 POS_SP_ACCEPT 1
42 200 POS_SP_X 1.3
42 200 POS_SP_Y 0.7
42 200 POS_SP_YAW 1.5708
42 200 POS_SP_Z -0.7
42 200 POS_TIMEOUT 2e+06
42 200 POS_YAW_TRACK 1
42 200 RC_NICK_CHAN 1
42 200 RC_ROLL_CHAN 2
42 200 RC_SAFETY_CHAN 5
42 200 RC_THRUST_CHAN 3
42 200 RC_TRIM_CHAN 0
42 200 RC_TUNE_CHAN1 7
42 200 RC_TUNE_CHAN2 5
42 200 RC_TUNE_CHAN3 6
42 200 RC_TUNE_CHAN4 8
42 200 RC_YAW_CHAN 4
42 200 SEND_DEBUGCHAN 0
42 200 SLOT_ATTITUDE 0
42 200 SLOT_CONTROL 0
42 200 SLOT_RAW_IMU 0
42 200 SLOT_RC 0
42 200 SYS_COMP_ID 200
42 200 SYS_ID 42
42 200 SYS_IMU_RESET 0
42 200 SYS_SW_VER 2001
42 200 SYS_TYPE 2
42 200 UART_0_BAUD 115200
42 200 UART_1_BAUD 57600
42 200 VEL_DAMP 0.95
42 200 VEL_OFFSET_X 0
42 200 VEL_OFFSET_Y 0
42 200 VEL_OFFSET_Z 0
42 200 VIS_OUTL_TRESH 0.2
42 200 VIS_YAWCORR 0

55
src/ui/MainWindow.ui
Unescape View File

@ -38,7 +38,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1000</width> <width>1000</width>
<height>23</height> <height>25</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuMGround"> <widget class="QMenu" name="menuMGround">
@ -113,7 +113,7 @@
<widget class="QStatusBar" name="statusBar"/> <widget class="QStatusBar" name="statusBar"/>
<action name="actionExit"> <action name="actionExit">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../../mavground.qrc">
<normaloff>:/images/actions/system-log-out.svg</normaloff>:/images/actions/system-log-out.svg</iconset> <normaloff>:/images/actions/system-log-out.svg</normaloff>:/images/actions/system-log-out.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -123,22 +123,9 @@
<string>Ctrl+Q</string> <string>Ctrl+Q</string>
</property> </property>
</action> </action>
<action name="actionSettings">
<property name="icon">
<iconset>
<normaloff>:/images/categories/preferences-system.svg</normaloff>
<normalon>:/images/categories/preferences-system.svg</normalon>:/images/categories/preferences-system.svg</iconset>
</property>
<property name="text">
<string>Settings</string>
</property>
<property name="shortcut">
<string>Ctrl+P</string>
</property>
</action>
<action name="actionLiftoff"> <action name="actionLiftoff">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../../mavground.qrc">
<normaloff>:/images/control/launch.svg</normaloff> <normaloff>:/images/control/launch.svg</normaloff>
<normalon>:/images/control/launch.svg</normalon>:/images/control/launch.svg</iconset> <normalon>:/images/control/launch.svg</normalon>:/images/control/launch.svg</iconset>
</property> </property>
@ -148,7 +135,7 @@
</action> </action>
<action name="actionLand"> <action name="actionLand">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../../mavground.qrc">
<normaloff>:/images/control/land.svg</normaloff>:/images/control/land.svg</iconset> <normaloff>:/images/control/land.svg</normaloff>:/images/control/land.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -173,7 +160,7 @@
</action> </action>
<action name="actionAdd_Link"> <action name="actionAdd_Link">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../../mavground.qrc">
<normaloff>:/images/actions/list-add.svg</normaloff>:/images/actions/list-add.svg</iconset> <normaloff>:/images/actions/list-add.svg</normaloff>:/images/actions/list-add.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -182,7 +169,7 @@
</action> </action>
<action name="actionConfiguration"> <action name="actionConfiguration">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../../mavground.qrc">
<normaloff>:/images/categories/applications-system.svg</normaloff>:/images/categories/applications-system.svg</iconset> <normaloff>:/images/categories/applications-system.svg</normaloff>:/images/categories/applications-system.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -194,7 +181,7 @@
</action> </action>
<action name="actionEngineerView"> <action name="actionEngineerView">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../../mavground.qrc">
<normaloff>:/images/apps/utilities-system-monitor.svg</normaloff>:/images/apps/utilities-system-monitor.svg</iconset> <normaloff>:/images/apps/utilities-system-monitor.svg</normaloff>:/images/apps/utilities-system-monitor.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -203,7 +190,7 @@
</action> </action>
<action name="actionPilotView"> <action name="actionPilotView">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../../mavground.qrc">
<normaloff>:/images/status/weather-overcast.svg</normaloff>:/images/status/weather-overcast.svg</iconset> <normaloff>:/images/status/weather-overcast.svg</normaloff>:/images/status/weather-overcast.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -212,7 +199,7 @@
</action> </action>
<action name="actionStyleConfig"> <action name="actionStyleConfig">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../../mavground.qrc">
<normaloff>:/images/categories/applications-internet.svg</normaloff>:/images/categories/applications-internet.svg</iconset> <normaloff>:/images/categories/applications-internet.svg</normaloff>:/images/categories/applications-internet.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -221,7 +208,7 @@
</action> </action>
<action name="actionJoystickSettings"> <action name="actionJoystickSettings">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../../mavground.qrc">
<normaloff>:/images/devices/input-gaming.svg</normaloff>:/images/devices/input-gaming.svg</iconset> <normaloff>:/images/devices/input-gaming.svg</normaloff>:/images/devices/input-gaming.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -230,7 +217,7 @@
</action> </action>
<action name="actionOperatorView"> <action name="actionOperatorView">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../../mavground.qrc">
<normaloff>:/images/status/network-wireless-encrypted.svg</normaloff>:/images/status/network-wireless-encrypted.svg</iconset> <normaloff>:/images/status/network-wireless-encrypted.svg</normaloff>:/images/status/network-wireless-encrypted.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -242,7 +229,7 @@
</action> </action>
<action name="action3DView"> <action name="action3DView">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../../mavground.qrc">
<normaloff>:/images/categories/preferences-system.svg</normaloff>:/images/categories/preferences-system.svg</iconset> <normaloff>:/images/categories/preferences-system.svg</normaloff>:/images/categories/preferences-system.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -257,7 +244,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../../mavground.qrc">
<normaloff>:/images/control/launch.svg</normaloff>:/images/control/launch.svg</iconset> <normaloff>:/images/control/launch.svg</normaloff>:/images/control/launch.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -269,7 +256,7 @@
</action> </action>
<action name="actionShow_full_view"> <action name="actionShow_full_view">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../../mavground.qrc">
<normaloff>:/images/status/network-transmit-receive.svg</normaloff>:/images/status/network-transmit-receive.svg</iconset> <normaloff>:/images/status/network-transmit-receive.svg</normaloff>:/images/status/network-transmit-receive.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -278,7 +265,7 @@
</action> </action>
<action name="actionShow_MAVLink_view"> <action name="actionShow_MAVLink_view">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../../mavground.qrc">
<normaloff>:/images/devices/network-wired.svg</normaloff>:/images/devices/network-wired.svg</iconset> <normaloff>:/images/devices/network-wired.svg</normaloff>:/images/devices/network-wired.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -287,7 +274,7 @@
</action> </action>
<action name="actionOnline_documentation"> <action name="actionOnline_documentation">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../../mavground.qrc">
<normaloff>:/images/categories/applications-internet.svg</normaloff>:/images/categories/applications-internet.svg</iconset> <normaloff>:/images/categories/applications-internet.svg</normaloff>:/images/categories/applications-internet.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -296,7 +283,7 @@
</action> </action>
<action name="actionShow_data_analysis_view"> <action name="actionShow_data_analysis_view">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../../mavground.qrc">
<normaloff>:/images/apps/utilities-system-monitor.svg</normaloff>:/images/apps/utilities-system-monitor.svg</iconset> <normaloff>:/images/apps/utilities-system-monitor.svg</normaloff>:/images/apps/utilities-system-monitor.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -305,7 +292,7 @@
</action> </action>
<action name="actionProject_Roadmap"> <action name="actionProject_Roadmap">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../../mavground.qrc">
<normaloff>:/images/status/software-update-available.svg</normaloff>:/images/status/software-update-available.svg</iconset> <normaloff>:/images/status/software-update-available.svg</normaloff>:/images/status/software-update-available.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -314,7 +301,7 @@
</action> </action>
<action name="actionCredits_Developers"> <action name="actionCredits_Developers">
<property name="icon"> <property name="icon">
<iconset> <iconset resource="../../mavground.qrc">
<normaloff>:/images/categories/preferences-system.svg</normaloff>:/images/categories/preferences-system.svg</iconset> <normaloff>:/images/categories/preferences-system.svg</normaloff>:/images/categories/preferences-system.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -323,7 +310,9 @@
</action> </action>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<resources/> <resources>
<include location="../../mavground.qrc"/>
</resources>
<connections> <connections>
<connection> <connection>
<sender>actionExit</sender> <sender>actionExit</sender>

Write Preview
Loading…
Cancel
Save