mavlink update to latest and enable address-of-packed-member warning

PX4 · Mar 14, 2019 · f3533d3 · f3533d3
1 parent f8ae8ba
commit f3533d3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/cmake/px4_add_common_flags.cmake b/cmake/px4_add_common_flags.cmake
@@ -99,7 +99,6 @@ function(px4_add_common_flags)
 			add_compile_options(
 				-Qunused-arguments
 
-				-Wno-address-of-packed-member # TODO: fix and enable (mavlink, etc)
 				-Wno-unknown-warning-option
 				-Wno-unused-const-variable
 				-Wno-varargs
@@ -113,10 +112,6 @@ function(px4_add_common_flags)
 			add_compile_options(-fdiagnostics-color=always)
 		endif()
 
-		if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9)
-			add_compile_options(-Wno-address-of-packed-member) # TODO: fix and enable (mavlink, etc)
-		endif()
-
 		add_compile_options(
 			-fno-builtin-printf
 			-fno-strength-reduce

diff --git a/mavlink/include/mavlink/v2.0 b/mavlink/include/mavlink/v2.0
diff --git a/src/modules/mavlink/mavlink_parameters.cpp b/src/modules/mavlink/mavlink_parameters.cpp
@@ -450,8 +450,7 @@ MavlinkParametersManager::send_uavcan()
 			msg.param_value = value.real_value;
 
 		} else {
-			int32_t val;
-			val = (int32_t)value.int_value;
+			int32_t val = (int32_t)value.int_value;
 			memcpy(&msg.param_value, &val, sizeof(int32_t));
 			msg.param_type = MAVLINK_TYPE_INT32_T;
 		}
@@ -545,14 +544,19 @@ MavlinkParametersManager::send_param(param_t param, int component_id)
 	 * get param value, since MAVLink encodes float and int params in the same
 	 * space during transmission, copy param onto float val_buf
 	 */
-	if (param_get(param, &msg.param_value) != OK) {
+	float param_value{};
+
+	if (param_get(param, &param_value) != OK) {
 		return 2;
 	}
 
+	msg.param_value = param_value;
+
 	msg.param_count = param_count_used();
 	msg.param_index = param_get_used_index(param);
 
 #if defined(__GNUC__) && __GNUC__ >= 8
+#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wstringop-truncation"
 #endif
 	/*
+1 −1		ASLUAV/ASLUAV.h
+1 −1		ASLUAV/version.h
+1 −1		ardupilotmega/ardupilotmega.h
+1 −1		ardupilotmega/version.h
+1 −1		autoquad/autoquad.h
+1 −1		autoquad/version.h
+1 −1		common/common.h
+1 −1		common/version.h
+1 −1		icarous/version.h
+1 −1		matrixpilot/matrixpilot.h
+1 −1		matrixpilot/version.h
+27 −41		mavlink_helpers.h
+1 −1		minimal/version.h
+1 −1		slugs/slugs.h
+1 −1		slugs/version.h
+1 −1		standard/standard.h
+1 −1		standard/version.h
+1 −1		test/version.h
+1 −1		uAvionix/version.h