Merge branch 'master' into dev-autocontinue

PX4 · Jul 17, 2019 · cc64cfb · cc64cfb
2 parents eea88b9 + 51d4239
commit cc64cfb
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 31 deletions.
diff --git a/.ci/Jenkinsfile-SITL_tests b/.ci/Jenkinsfile-SITL_tests
@@ -61,12 +61,12 @@ pipeline {
               vehicle: "iris"
             ],
 
-            [
-              name: "Rover 1",
-              test: "mavros_posix_test_mission.test",
-              mission: "rover_mission_1",
-              vehicle: "rover"
-            ],
+            //[
+            //  name: "Rover 1",
+            //  test: "mavros_posix_test_mission.test",
+            //  mission: "rover_mission_1",
+            //  vehicle: "rover"
+            //],
 
             [
               name: "VTOL_standard",

diff --git a/.ci/Jenkinsfile-SITL_tests_ASan b/.ci/Jenkinsfile-SITL_tests_ASan
@@ -61,12 +61,12 @@ pipeline {
               vehicle: "iris"
             ],
 
-            [
-              name: "Rover 1",
-              test: "mavros_posix_test_mission.test",
-              mission: "rover_mission_1",
-              vehicle: "rover"
-            ],
+            //[
+            //  name: "Rover 1",
+            //  test: "mavros_posix_test_mission.test",
+            //  mission: "rover_mission_1",
+            //  vehicle: "rover"
+            //],
 
             [
               name: "VTOL_standard",

diff --git a/.ci/Jenkinsfile-SITL_tests_coverage b/.ci/Jenkinsfile-SITL_tests_coverage
@@ -35,12 +35,12 @@ pipeline {
               vehicle: "iris"
             ],
 
-            [
-              name: "Rover 1",
-              test: "mavros_posix_test_mission.test",
-              mission: "rover_mission_1",
-              vehicle: "rover"
-            ],
+            //[
+            //  name: "Rover 1",
+            //  test: "mavros_posix_test_mission.test",
+            //  mission: "rover_mission_1",
+            //  vehicle: "rover"
+            //],
 
             [
               name: "VTOL_standard",

diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS
@@ -20,6 +20,7 @@ set +e
 # Do not add intra word spaces
 # it wastes flash
 #
+set AUTOCNF no
 set AUX_MODE pwm
 set DATAMAN_OPT ""
 set FAILSAFE none
@@ -148,18 +149,15 @@ else
 	#
 	# Set AUTOCNF flag to use it in AUTOSTART scripts.
 	#
-	if param compare SYS_AUTOCONFIG 1
+	if param greater SYS_AUTOCONFIG 0
 	then
-		# Wipe out params except RC*, flight modes, total flight time, accel cal, gyro cal
-		param reset_nostart RC* COM_FLTMODE* LND_FLIGHT_T_* TC_* CAL_ACC* CAL_GYRO*
-		set AUTOCNF yes
-	else
-		if param compare SYS_AUTOCONFIG 2
+		if param compare SYS_AUTOCONFIG 1
 		then
-			set AUTOCNF yes
-		else
-			set AUTOCNF no
+			# Wipe out params except RC*, flight modes, total flight time, accel cal, gyro cal
+			param reset_nostart RC* COM_FLTMODE* LND_FLIGHT_T_* TC_* CAL_ACC* CAL_GYRO*
 		fi
+
+		set AUTOCNF yes
 	fi
 
 	#

diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp
@@ -2322,15 +2322,15 @@ MavlinkReceiver::handle_message_utm_global_position(mavlink_message_t *msg)
 
 	t.flags = 0;
 
-	if (utm_pos.flags | UTM_DATA_AVAIL_FLAGS_POSITION_AVAILABLE) {
+	if (utm_pos.flags & UTM_DATA_AVAIL_FLAGS_POSITION_AVAILABLE) {
 		t.flags |= transponder_report_s::PX4_ADSB_FLAGS_VALID_COORDS;
 	}
 
-	if (utm_pos.flags | UTM_DATA_AVAIL_FLAGS_ALTITUDE_AVAILABLE) {
+	if (utm_pos.flags & UTM_DATA_AVAIL_FLAGS_ALTITUDE_AVAILABLE) {
 		t.flags |= transponder_report_s::PX4_ADSB_FLAGS_VALID_ALTITUDE;
 	}
 
-	if (utm_pos.flags | UTM_DATA_AVAIL_FLAGS_HORIZONTAL_VELO_AVAILABLE) {
+	if (utm_pos.flags & UTM_DATA_AVAIL_FLAGS_HORIZONTAL_VELO_AVAILABLE) {
 		t.flags |= transponder_report_s::PX4_ADSB_FLAGS_VALID_HEADING;
 		t.flags |= transponder_report_s::PX4_ADSB_FLAGS_VALID_VELOCITY;
 	}

diff --git a/src/modules/rover_pos_control/RoverPositionControl.hpp b/src/modules/rover_pos_control/RoverPositionControl.hpp
@@ -129,7 +129,7 @@ class RoverPositionControl
 
 	ECL_L1_Pos_Controller				_gnd_control;
 
-	bool _waypoint_reached;
+	bool _waypoint_reached{false};
 
 	enum UGV_POSCTRL_MODE {
 		UGV_POSCTRL_MODE_AUTO,