Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-31 18:47:21 +08:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

FMUv1: Fix CAN compilation

Browse Source
This commit is contained in:
Lorenz Meier
2015-10-11 14:06:43 +02:00
parent b799c730f2
commit e96f4e1944
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/configs/nuttx_px4fmu-v1_default.cmake
+1
View File
@@ -98,6 +98,7 @@ set(config_module_list
modules/controllib modules/controllib
modules/uORB modules/uORB
modules/dataman modules/dataman
modules/uavcan
# #
# Libraries # Libraries
src/modules/uavcan/uavcan_main.cpp
+2
View File
@@ -530,8 +530,10 @@ int UavcanNode::start(uavcan::NodeID node_id, uint32_t bitrate)
* If no transceiver is connected, the RX pin will float, occasionally causing CAN controller to * If no transceiver is connected, the RX pin will float, occasionally causing CAN controller to
* fail during initialization. * fail during initialization.
*/ */
#ifdef GPIO_CAN1_RX
stm32_configgpio(GPIO_CAN1_RX); stm32_configgpio(GPIO_CAN1_RX);
stm32_configgpio(GPIO_CAN1_TX); stm32_configgpio(GPIO_CAN1_TX);
#endif
stm32_configgpio(GPIO_CAN2_RX | GPIO_PULLUP); stm32_configgpio(GPIO_CAN2_RX | GPIO_PULLUP);
stm32_configgpio(GPIO_CAN2_TX); stm32_configgpio(GPIO_CAN2_TX);