Merge branch 'main' into disable-thrust-reduction

CMakeLists.txt

@@ -408,14 +408,15 @@ include(px4_add_gtest)
 if(BUILD_TESTING)
 	include(gtest)
 
-	set(TESTFILTERARG "")
-
+	# Ensure there's no -R without any filter expression since that trips newer ctest versions
 	if(TESTFILTER)
-		set(TESTFILTERARG "-R ${TESTFILTER}")
+		set(TESTFILTERARG "-R")
+	else()
+		set(TESTFILTERARG "")
 	endif()
 
 	add_custom_target(test_results
-			COMMAND GTEST_COLOR=1 ${CMAKE_CTEST_COMMAND} --output-on-failure -T Test ${TESTFILTERARG}
+			COMMAND GTEST_COLOR=1 ${CMAKE_CTEST_COMMAND} --output-on-failure -T Test ${TESTFILTERARG} ${TESTFILTER}
 			DEPENDS
 				px4
 				examples__dyn_hello

boards/hkust/nxt-dual/src/board_config.h

@@ -95,7 +95,7 @@
 /* Define GPIO pins used as ADC N.B. Channel numbers must match below  */
 /* Define Channel numbers must match above GPIO pin IN(n)*/
 #define ADC_BATTERY_VOLTAGE_CHANNEL             ADC12_CH(4)
-#define ADC_BATTERY_CURRENT_CHANNEL             ADC12_CH(5)
+#define ADC_BATTERY_CURRENT_CHANNEL             ADC12_CH(8)
 
 #define ADC_CHANNELS \
 	((1 << ADC_BATTERY_VOLTAGE_CHANNEL) | \

platforms/nuttx/cmake/upload.cmake

@@ -42,12 +42,14 @@ set(serial_ports)
 if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux")
 
 	set(px4_usb_path "${vendorstr_underscore}_${productstr_underscore}")
+	set(px4_bl_usb_path "${vendorstr_underscore}_BL")
 
 	list(APPEND serial_ports
 		# NuttX vendor + product string
 		/dev/serial/by-id/*-${px4_usb_path}*
 
 		# Bootloader
+		/dev/serial/by-id/*_${px4_bl_usb_path}*
 		/dev/serial/by-id/*PX4_BL* # typical bootloader USB device string
 		/dev/serial/by-id/*BL_FMU*