Added rates setpoints, improved vehicle config UI

libs/mavlink/include/mavlink/v1.0/mavlink_helpers.h

@@ -12,15 +12,18 @@
 /*
  * Internal function to give access to the channel status for each channel
  */
+#ifndef MAVLINK_GET_CHANNEL_STATUS
 MAVLINK_HELPER mavlink_status_t* mavlink_get_channel_status(uint8_t chan)
 {
 	static mavlink_status_t m_mavlink_status[MAVLINK_COMM_NUM_BUFFERS];
 	return &m_mavlink_status[chan];
 }
+#endif
 
 /*
  * Internal function to give access to the channel buffer for each channel
  */
+#ifndef MAVLINK_GET_CHANNEL_BUFFER
 MAVLINK_HELPER mavlink_message_t* mavlink_get_channel_buffer(uint8_t chan)
 {
 	
@@ -35,6 +38,7 @@ MAVLINK_HELPER mavlink_message_t* mavlink_get_channel_buffer(uint8_t chan)
 #endif
 	return &m_mavlink_buffer[chan];
 }
+#endif
 
 /**
  * @brief Reset the status of a channel.
@@ -558,8 +562,3 @@ MAVLINK_HELPER void _mavlink_send_uart(mavlink_channel_t chan, const char *buf,
 #endif // MAVLINK_USE_CONVENIENCE_FUNCTIONS
 
 #endif /* _MAVLINK_HELPERS_H_ */
-dif
-}
-#endif // MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-#endif /* _MAVLINK_HELPERS_H_ */

libs/mavlink/include/mavlink/v1.0/protocol.h

@@ -42,7 +42,9 @@
 #endif // MAVLINK_SEPARATE_HELPERS
 
 /* always include the prototypes to ensure we don't get out of sync */
+#ifndef MAVLINK_GET_CHANNEL_STATUS
 MAVLINK_HELPER mavlink_status_t* mavlink_get_channel_status(uint8_t chan);
+#endif
 MAVLINK_HELPER void mavlink_reset_channel_status(uint8_t chan);
 #if MAVLINK_CRC_EXTRA
 MAVLINK_HELPER uint16_t mavlink_finalize_message_chan(mavlink_message_t* msg, uint8_t system_id, uint8_t component_id, 
@@ -322,6 +324,3 @@ _MAV_RETURN_ARRAY(float,    f)
 _MAV_RETURN_ARRAY(double,   d)
 
 #endif // _MAVLINK_PROTOCOL_H_
-ble,   d)
-
-#endif // _MAVLINK_PROTOCOL_H_

src/ui/QGCVehicleConfig.cc

@@ -543,12 +543,12 @@ void QGCVehicleConfig::parameterChanged(int uas, int component, QString paramete
 
     if (parameterName.contains("RC_MAP_AUX2")) {
         rcMapping[6] = value.toInt() - 1;
-        ui->aux1SpinBox->setValue(rcMapping[6]+1);
+        ui->aux2SpinBox->setValue(rcMapping[6]+1);
     }
 
     if (parameterName.contains("RC_MAP_AUX3")) {
         rcMapping[7] = value.toInt() - 1;
-        ui->aux1SpinBox->setValue(rcMapping[7]+1);
+        ui->aux3SpinBox->setValue(rcMapping[7]+1);
     }
 
     // Scaling

src/ui/QGCVehicleConfig.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>717</width>
+    <width>780</width>
     <height>586</height>
    </rect>
   </property>
@@ -40,7 +40,7 @@
    <item row="0" column="0" colspan="2">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="rcTab">
       <attribute name="title">
@@ -725,7 +725,7 @@
       <attribute name="title">
        <string>Sensor Calibration</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_6" columnstretch="70,30">
+      <layout class="QGridLayout" name="gridLayout_6" columnstretch="55,45">
        <property name="topMargin">
         <number>20</number>
        </property>