Merge branch 'ardupilot-MFE_AirSpeed_CAN' of https://github.com/mikef…

…enghao/ardupilot-mfe into ardupilot-MFE_AirSpeed_CAN
ArduPilot · Jan 10, 2025 · 794a370 · 794a370
2 parents 9e865d1 + 1c53663
commit 794a370
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MFE_AirSpeed_CAN/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MFE_AirSpeed_CAN/hwdef.dat
@@ -10,8 +10,6 @@ undef PA10
 PA10 LED OUTPUT LOW
 
 # order of UARTs
-#undef SERIAL_ORDER
-
 SERIAL_ORDER EMPTY EMPTY EMPTY USART2
 
 # USART2 for debug (disabled)

diff --git a/modules/DroneCAN/DSDL b/modules/DroneCAN/DSDL
diff --git a/modules/mavlink b/modules/mavlink
+0 −1		message_definitions/v1.0/ardupilotmega.xml
+0 −146		message_definitions/v1.0/development.xml