GCS_MAVLink: generate run on master

libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/ardupilotmega.h

@@ -2,11 +2,11 @@
  *	@brief MAVLink comm protocol generated from ardupilotmega.xml
  *	@see http://qgroundcontrol.org/mavlink/
  */
-#ifndef ARDUPILOTMEGA_H
-#define ARDUPILOTMEGA_H
+#ifndef MAVLINK_ARDUPILOTMEGA_H
+#define MAVLINK_ARDUPILOTMEGA_H
 
 #ifndef MAVLINK_H
-    #error Wrong include order: ARDUPILOTMEGA.H MUST NOT BE DIRECTLY USED. Include mavlink.h from the same directory instead or set ALL AND EVERY defines from MAVLINK.H manually accordingly, including the #define MAVLINK_H call.
+    #error Wrong include order: MAVLINK_ARDUPILOTMEGA.H MUST NOT BE DIRECTLY USED. Include mavlink.h from the same directory instead or set ALL AND EVERY defines from MAVLINK.H manually accordingly, including the #define MAVLINK_H call.
 #endif
 
 #ifdef __cplusplus
@@ -242,4 +242,4 @@ typedef enum CAMERA_FEEDBACK_FLAGS
 #ifdef __cplusplus
 }
 #endif // __cplusplus
-#endif // ARDUPILOTMEGA_H
+#endif // MAVLINK_ARDUPILOTMEGA_H

libraries/GCS_MAVLink/include/mavlink/v1.0/ardupilotmega/testsuite.h

@@ -30,19 +30,8 @@ static void mavlink_test_sensor_offsets(uint8_t system_id, uint8_t component_id,
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_sensor_offsets_t packet_in = {
-		17.0,
-	}963497672,
-	}963497880,
-	}101.0,
-	}129.0,
-	}157.0,
-	}185.0,
-	}213.0,
-	}241.0,
-	}19107,
-	}19211,
-	}19315,
-	};
+		17.0,963497672,963497880,101.0,129.0,157.0,185.0,213.0,241.0,19107,19211,19315
+    };
 	mavlink_sensor_offsets_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.mag_declination = packet_in.mag_declination;
@@ -95,12 +84,8 @@ static void mavlink_test_set_mag_offsets(uint8_t system_id, uint8_t component_id
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_set_mag_offsets_t packet_in = {
-		17235,
-	}17339,
-	}17443,
-	}151,
-	}218,
-	};
+		17235,17339,17443,151,218
+    };
 	mavlink_set_mag_offsets_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.mag_ofs_x = packet_in.mag_ofs_x;
@@ -146,9 +131,8 @@ static void mavlink_test_meminfo(uint8_t system_id, uint8_t component_id, mavlin
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_meminfo_t packet_in = {
-		17235,
-	}17339,
-	};
+		17235,17339
+    };
 	mavlink_meminfo_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.brkval = packet_in.brkval;
@@ -191,13 +175,8 @@ static void mavlink_test_ap_adc(uint8_t system_id, uint8_t component_id, mavlink
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_ap_adc_t packet_in = {
-		17235,
-	}17339,
-	}17443,
-	}17547,
-	}17651,
-	}17755,
-	};
+		17235,17339,17443,17547,17651,17755
+    };
 	mavlink_ap_adc_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.adc1 = packet_in.adc1;
@@ -244,18 +223,8 @@ static void mavlink_test_digicam_configure(uint8_t system_id, uint8_t component_
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_digicam_configure_t packet_in = {
-		17.0,
-	}17443,
-	}151,
-	}218,
-	}29,
-	}96,
-	}163,
-	}230,
-	}41,
-	}108,
-	}175,
-	};
+		17.0,17443,151,218,29,96,163,230,41,108,175
+    };
 	mavlink_digicam_configure_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.extra_value = packet_in.extra_value;
@@ -307,17 +276,8 @@ static void mavlink_test_digicam_control(uint8_t system_id, uint8_t component_id
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_digicam_control_t packet_in = {
-		17.0,
-	}17,
-	}84,
-	}151,
-	}218,
-	}29,
-	}96,
-	}163,
-	}230,
-	}41,
-	};
+		17.0,17,84,151,218,29,96,163,230,41
+    };
 	mavlink_digicam_control_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.extra_value = packet_in.extra_value;
@@ -368,13 +328,8 @@ static void mavlink_test_mount_configure(uint8_t system_id, uint8_t component_id
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_mount_configure_t packet_in = {
-		5,
-	}72,
-	}139,
-	}206,
-	}17,
-	}84,
-	};
+		5,72,139,206,17,84
+    };
 	mavlink_mount_configure_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.target_system = packet_in.target_system;
@@ -421,13 +376,8 @@ static void mavlink_test_mount_control(uint8_t system_id, uint8_t component_id,
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_mount_control_t packet_in = {
-		963497464,
-	}963497672,
-	}963497880,
-	}41,
-	}108,
-	}175,
-	};
+		963497464,963497672,963497880,41,108,175
+    };
 	mavlink_mount_control_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.input_a = packet_in.input_a;
@@ -474,12 +424,8 @@ static void mavlink_test_mount_status(uint8_t system_id, uint8_t component_id, m
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_mount_status_t packet_in = {
-		963497464,
-	}963497672,
-	}963497880,
-	}41,
-	}108,
-	};
+		963497464,963497672,963497880,41,108
+    };
 	mavlink_mount_status_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.pointing_a = packet_in.pointing_a;
@@ -525,13 +471,8 @@ static void mavlink_test_fence_point(uint8_t system_id, uint8_t component_id, ma
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_fence_point_t packet_in = {
-		17.0,
-	}45.0,
-	}29,
-	}96,
-	}163,
-	}230,
-	};
+		17.0,45.0,29,96,163,230
+    };
 	mavlink_fence_point_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.lat = packet_in.lat;
@@ -578,10 +519,8 @@ static void mavlink_test_fence_fetch_point(uint8_t system_id, uint8_t component_
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_fence_fetch_point_t packet_in = {
-		5,
-	}72,
-	}139,
-	};
+		5,72,139
+    };
 	mavlink_fence_fetch_point_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.target_system = packet_in.target_system;
@@ -625,11 +564,8 @@ static void mavlink_test_fence_status(uint8_t system_id, uint8_t component_id, m
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_fence_status_t packet_in = {
-		963497464,
-	}17443,
-	}151,
-	}218,
-	};
+		963497464,17443,151,218
+    };
 	mavlink_fence_status_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.breach_time = packet_in.breach_time;
@@ -674,14 +610,8 @@ static void mavlink_test_ahrs(uint8_t system_id, uint8_t component_id, mavlink_m
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_ahrs_t packet_in = {
-		17.0,
-	}45.0,
-	}73.0,
-	}101.0,
-	}129.0,
-	}157.0,
-	}185.0,
-	};
+		17.0,45.0,73.0,101.0,129.0,157.0,185.0
+    };
 	mavlink_ahrs_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.omegaIx = packet_in.omegaIx;
@@ -729,18 +659,8 @@ static void mavlink_test_simstate(uint8_t system_id, uint8_t component_id, mavli
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_simstate_t packet_in = {
-		17.0,
-	}45.0,
-	}73.0,
-	}101.0,
-	}129.0,
-	}157.0,
-	}185.0,
-	}213.0,
-	}241.0,
-	}963499336,
-	}963499544,
-	};
+		17.0,45.0,73.0,101.0,129.0,157.0,185.0,213.0,241.0,963499336,963499544
+    };
 	mavlink_simstate_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.roll = packet_in.roll;
@@ -792,9 +712,8 @@ static void mavlink_test_hwstatus(uint8_t system_id, uint8_t component_id, mavli
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_hwstatus_t packet_in = {
-		17235,
-	}139,
-	};
+		17235,139
+    };
 	mavlink_hwstatus_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.Vcc = packet_in.Vcc;
@@ -837,14 +756,8 @@ static void mavlink_test_radio(uint8_t system_id, uint8_t component_id, mavlink_
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_radio_t packet_in = {
-		17235,
-	}17339,
-	}17,
-	}84,
-	}151,
-	}218,
-	}29,
-	};
+		17235,17339,17,84,151,218,29
+    };
 	mavlink_radio_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.rxerrors = packet_in.rxerrors;
@@ -892,16 +805,8 @@ static void mavlink_test_limits_status(uint8_t system_id, uint8_t component_id,
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_limits_status_t packet_in = {
-		963497464,
-	}963497672,
-	}963497880,
-	}963498088,
-	}18067,
-	}187,
-	}254,
-	}65,
-	}132,
-	};
+		963497464,963497672,963497880,963498088,18067,187,254,65,132
+    };
 	mavlink_limits_status_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.last_trigger = packet_in.last_trigger;
@@ -951,10 +856,8 @@ static void mavlink_test_wind(uint8_t system_id, uint8_t component_id, mavlink_m
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_wind_t packet_in = {
-		17.0,
-	}45.0,
-	}73.0,
-	};
+		17.0,45.0,73.0
+    };
 	mavlink_wind_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.direction = packet_in.direction;
@@ -998,10 +901,8 @@ static void mavlink_test_data16(uint8_t system_id, uint8_t component_id, mavlink
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_data16_t packet_in = {
-		5,
-	}72,
-	}{ 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154 },
-	};
+		5,72,{ 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154 }
+    };
 	mavlink_data16_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.type = packet_in.type;
@@ -1045,10 +946,8 @@ static void mavlink_test_data32(uint8_t system_id, uint8_t component_id, mavlink
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_data32_t packet_in = {
-		5,
-	}72,
-	}{ 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170 },
-	};
+		5,72,{ 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170 }
+    };
 	mavlink_data32_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.type = packet_in.type;
@@ -1092,10 +991,8 @@ static void mavlink_test_data64(uint8_t system_id, uint8_t component_id, mavlink
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_data64_t packet_in = {
-		5,
-	}72,
-	}{ 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202 },
-	};
+		5,72,{ 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202 }
+    };
 	mavlink_data64_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.type = packet_in.type;
@@ -1139,10 +1036,8 @@ static void mavlink_test_data96(uint8_t system_id, uint8_t component_id, mavlink
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_data96_t packet_in = {
-		5,
-	}72,
-	}{ 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234 },
-	};
+		5,72,{ 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234 }
+    };
 	mavlink_data96_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.type = packet_in.type;
@@ -1186,9 +1081,8 @@ static void mavlink_test_rangefinder(uint8_t system_id, uint8_t component_id, ma
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_rangefinder_t packet_in = {
-		17.0,
-	}45.0,
-	};
+		17.0,45.0
+    };
 	mavlink_rangefinder_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.distance = packet_in.distance;
@@ -1231,19 +1125,8 @@ static void mavlink_test_airspeed_autocal(uint8_t system_id, uint8_t component_i
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_airspeed_autocal_t packet_in = {
-		17.0,
-	}45.0,
-	}73.0,
-	}101.0,
-	}129.0,
-	}157.0,
-	}185.0,
-	}213.0,
-	}241.0,
-	}269.0,
-	}297.0,
-	}325.0,
-	};
+		17.0,45.0,73.0,101.0,129.0,157.0,185.0,213.0,241.0,269.0,297.0,325.0
+    };
 	mavlink_airspeed_autocal_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.vx = packet_in.vx;
@@ -1296,17 +1179,8 @@ static void mavlink_test_rally_point(uint8_t system_id, uint8_t component_id, ma
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_rally_point_t packet_in = {
-		963497464,
-	}963497672,
-	}17651,
-	}17755,
-	}17859,
-	}175,
-	}242,
-	}53,
-	}120,
-	}187,
-	};
+		963497464,963497672,17651,17755,17859,175,242,53,120,187
+    };
 	mavlink_rally_point_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.lat = packet_in.lat;
@@ -1357,10 +1231,8 @@ static void mavlink_test_rally_fetch_point(uint8_t system_id, uint8_t component_
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_rally_fetch_point_t packet_in = {
-		5,
-	}72,
-	}139,
-	};
+		5,72,139
+    };
 	mavlink_rally_fetch_point_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.target_system = packet_in.target_system;
@@ -1404,13 +1276,8 @@ static void mavlink_test_compassmot_status(uint8_t system_id, uint8_t component_
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_compassmot_status_t packet_in = {
-		17.0,
-	}45.0,
-	}73.0,
-	}101.0,
-	}18067,
-	}18171,
-	};
+		17.0,45.0,73.0,101.0,18067,18171
+    };
 	mavlink_compassmot_status_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.current = packet_in.current;
@@ -1457,13 +1324,8 @@ static void mavlink_test_ahrs2(uint8_t system_id, uint8_t component_id, mavlink_
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_ahrs2_t packet_in = {
-		17.0,
-	}45.0,
-	}73.0,
-	}101.0,
-	}963498296,
-	}963498504,
-	};
+		17.0,45.0,73.0,101.0,963498296,963498504
+    };
 	mavlink_ahrs2_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.roll = packet_in.roll;
@@ -1510,16 +1372,8 @@ static void mavlink_test_camera_status(uint8_t system_id, uint8_t component_id,
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_camera_status_t packet_in = {
-		93372036854775807ULL,
-	}73.0,
-	}101.0,
-	}129.0,
-	}157.0,
-	}18483,
-	}211,
-	}22,
-	}89,
-	};
+		93372036854775807ULL,73.0,101.0,129.0,157.0,18483,211,22,89
+    };
 	mavlink_camera_status_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.time_usec = packet_in.time_usec;
@@ -1569,20 +1423,8 @@ static void mavlink_test_camera_feedback(uint8_t system_id, uint8_t component_id
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_camera_feedback_t packet_in = {
-		93372036854775807ULL,
-	}963497880,
-	}963498088,
-	}129.0,
-	}157.0,
-	}185.0,
-	}213.0,
-	}241.0,
-	}269.0,
-	}19315,
-	}3,
-	}70,
-	}137,
-	};
+		93372036854775807ULL,963497880,963498088,129.0,157.0,185.0,213.0,241.0,269.0,19315,3,70,137
+    };
 	mavlink_camera_feedback_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.time_usec = packet_in.time_usec;
@@ -1636,9 +1478,8 @@ static void mavlink_test_battery2(uint8_t system_id, uint8_t component_id, mavli
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
 	mavlink_battery2_t packet_in = {
-		17235,
-	}17339,
-	};
+		17235,17339
+    };
 	mavlink_battery2_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));
         	packet1.voltage = packet_in.voltage;

libraries/GCS_MAVLink/include/mavlink/v1.0/common/common.h

@@ -2,11 +2,11 @@
  *	@brief MAVLink comm protocol generated from common.xml
  *	@see http://qgroundcontrol.org/mavlink/
  */
-#ifndef COMMON_H
-#define COMMON_H
+#ifndef MAVLINK_COMMON_H
+#define MAVLINK_COMMON_H
 
 #ifndef MAVLINK_H
-    #error Wrong include order: COMMON.H MUST NOT BE DIRECTLY USED. Include mavlink.h from the same directory instead or set ALL AND EVERY defines from MAVLINK.H manually accordingly, including the #define MAVLINK_H call.
+    #error Wrong include order: MAVLINK_COMMON.H MUST NOT BE DIRECTLY USED. Include mavlink.h from the same directory instead or set ALL AND EVERY defines from MAVLINK.H manually accordingly, including the #define MAVLINK_H call.
 #endif
 
 #ifdef __cplusplus
@@ -681,4 +681,4 @@ typedef enum MAV_BATTERY_FUNCTION
 #ifdef __cplusplus
 }
 #endif // __cplusplus
-#endif // COMMON_H
+#endif // MAVLINK_COMMON_H

libraries/GCS_MAVLink/include/mavlink/v1.0/mavlink_helpers.h

@@ -16,7 +16,7 @@
 #ifndef MAVLINK_GET_CHANNEL_STATUS
 MAVLINK_HELPER mavlink_status_t* mavlink_get_channel_status(uint8_t chan)
 {
-#if MAVLINK_EXTERNAL_RX_STATUS
+#ifdef MAVLINK_EXTERNAL_RX_STATUS
 	// No m_mavlink_status array defined in function,
 	// has to be defined externally
 #else
@@ -33,7 +33,7 @@ MAVLINK_HELPER mavlink_status_t* mavlink_get_channel_status(uint8_t chan)
 MAVLINK_HELPER mavlink_message_t* mavlink_get_channel_buffer(uint8_t chan)
 {
 	
-#if MAVLINK_EXTERNAL_RX_BUFFER
+#ifdef MAVLINK_EXTERNAL_RX_BUFFER
 	// No m_mavlink_buffer array defined in function,
 	// has to be defined externally
 #else
@@ -263,7 +263,7 @@ MAVLINK_HELPER uint8_t mavlink_parse_char(uint8_t chan, uint8_t c, mavlink_messa
  and out). Only use if the channel will only contain messages types listed in
  the headers.
 */
-#if MAVLINK_CHECK_MESSAGE_LENGTH
+#ifdef MAVLINK_CHECK_MESSAGE_LENGTH
 #ifndef MAVLINK_MESSAGE_LENGTH
 	static const uint8_t mavlink_message_lengths[256] = MAVLINK_MESSAGE_LENGTHS;
 #define MAVLINK_MESSAGE_LENGTH(msgid) mavlink_message_lengths[msgid]
@@ -332,7 +332,7 @@ MAVLINK_HELPER uint8_t mavlink_parse_char(uint8_t chan, uint8_t c, mavlink_messa
 		break;
 
 	case MAVLINK_PARSE_STATE_GOT_COMPID:
-#if MAVLINK_CHECK_MESSAGE_LENGTH
+#ifdef MAVLINK_CHECK_MESSAGE_LENGTH
 	        if (rxmsg->len != MAVLINK_MESSAGE_LENGTH(c))
 		{
 			status->parse_error++;

libraries/GCS_MAVLink/include/mavlink/v1.0/protocol.h

@@ -34,46 +34,51 @@
 #define MAVLINK_END_UART_SEND(chan, length)
 #endif
 
+/* option to provide alternative implementation of mavlink_helpers.h */
 #ifdef MAVLINK_SEPARATE_HELPERS
-#define MAVLINK_HELPER
-#else
-#define MAVLINK_HELPER static inline
-#include "mavlink_helpers.h"
-#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, 
-						      uint8_t chan, uint8_t length, uint8_t crc_extra);
-MAVLINK_HELPER uint16_t mavlink_finalize_message(mavlink_message_t* msg, uint8_t system_id, uint8_t component_id, 
-						 uint8_t length, uint8_t crc_extra);
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-MAVLINK_HELPER void _mav_finalize_message_chan_send(mavlink_channel_t chan, uint8_t msgid, const char *packet, 
-						    uint8_t length, uint8_t crc_extra);
-#endif
+    #define MAVLINK_HELPER
+
+    /* decls in sync with those in mavlink_helpers.h */
+    #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,
+                                  uint8_t chan, uint8_t length, uint8_t crc_extra);
+    MAVLINK_HELPER uint16_t mavlink_finalize_message(mavlink_message_t* msg, uint8_t system_id, uint8_t component_id,
+                             uint8_t length, uint8_t crc_extra);
+    #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
+    MAVLINK_HELPER void _mav_finalize_message_chan_send(mavlink_channel_t chan, uint8_t msgid, const char *packet,
+                                uint8_t length, uint8_t crc_extra);
+    #endif
+    #else
+    MAVLINK_HELPER uint16_t mavlink_finalize_message_chan(mavlink_message_t* msg, uint8_t system_id, uint8_t component_id,
+                                  uint8_t chan, uint8_t length);
+    MAVLINK_HELPER uint16_t mavlink_finalize_message(mavlink_message_t* msg, uint8_t system_id, uint8_t component_id,
+                             uint8_t length);
+    #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
+    MAVLINK_HELPER void _mav_finalize_message_chan_send(mavlink_channel_t chan, uint8_t msgid, const char *packet, uint8_t length);
+    #endif
+    #endif // MAVLINK_CRC_EXTRA
+    MAVLINK_HELPER uint16_t mavlink_msg_to_send_buffer(uint8_t *buffer, const mavlink_message_t *msg);
+    MAVLINK_HELPER void mavlink_start_checksum(mavlink_message_t* msg);
+    MAVLINK_HELPER void mavlink_update_checksum(mavlink_message_t* msg, uint8_t c);
+    MAVLINK_HELPER uint8_t mavlink_parse_char(uint8_t chan, uint8_t c, mavlink_message_t* r_message, mavlink_status_t* r_mavlink_status);
+    MAVLINK_HELPER uint8_t put_bitfield_n_by_index(int32_t b, uint8_t bits, uint8_t packet_index, uint8_t bit_index,
+                               uint8_t* r_bit_index, uint8_t* buffer);
+    #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
+    MAVLINK_HELPER void _mavlink_send_uart(mavlink_channel_t chan, const char *buf, uint16_t len);
+    MAVLINK_HELPER void _mavlink_resend_uart(mavlink_channel_t chan, const mavlink_message_t *msg);
+    #endif
+
 #else
-MAVLINK_HELPER uint16_t mavlink_finalize_message_chan(mavlink_message_t* msg, uint8_t system_id, uint8_t component_id, 
-						      uint8_t chan, uint8_t length);
-MAVLINK_HELPER uint16_t mavlink_finalize_message(mavlink_message_t* msg, uint8_t system_id, uint8_t component_id, 
-						 uint8_t length);
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-MAVLINK_HELPER void _mav_finalize_message_chan_send(mavlink_channel_t chan, uint8_t msgid, const char *packet, uint8_t length);
-#endif
-#endif // MAVLINK_CRC_EXTRA
-MAVLINK_HELPER uint16_t mavlink_msg_to_send_buffer(uint8_t *buffer, const mavlink_message_t *msg);
-MAVLINK_HELPER void mavlink_start_checksum(mavlink_message_t* msg);
-MAVLINK_HELPER void mavlink_update_checksum(mavlink_message_t* msg, uint8_t c);
-MAVLINK_HELPER uint8_t mavlink_parse_char(uint8_t chan, uint8_t c, mavlink_message_t* r_message, mavlink_status_t* r_mavlink_status);
-MAVLINK_HELPER uint8_t put_bitfield_n_by_index(int32_t b, uint8_t bits, uint8_t packet_index, uint8_t bit_index, 
-					       uint8_t* r_bit_index, uint8_t* buffer);
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-MAVLINK_HELPER void _mavlink_send_uart(mavlink_channel_t chan, const char *buf, uint16_t len);
-MAVLINK_HELPER void _mavlink_resend_uart(mavlink_channel_t chan, const mavlink_message_t *msg);
-#endif
+
+    #define MAVLINK_HELPER static inline
+    #include "mavlink_helpers.h"
+
+#endif // MAVLINK_SEPARATE_HELPERS
 
 /**
  * @brief Get the required buffer size for this message