From 5076ba0049c3840c63f7393fcfe8628fba916afc Mon Sep 17 00:00:00 2001 From: Henry Zhang Date: Wed, 17 Aug 2016 13:59:16 +0800 Subject: [PATCH] MindPX: Disable second CAN bus. --- cmake/configs/nuttx_mindpx-v2_default.cmake | 2 +- nuttx-configs/mindpx-v2/include/board.h | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/cmake/configs/nuttx_mindpx-v2_default.cmake b/cmake/configs/nuttx_mindpx-v2_default.cmake index 656fa377a1..f1efda0df1 100644 --- a/cmake/configs/nuttx_mindpx-v2_default.cmake +++ b/cmake/configs/nuttx_mindpx-v2_default.cmake @@ -2,7 +2,7 @@ include(nuttx/px4_impl_nuttx) set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-none-eabi.cmake) -set(config_uavcan_num_ifaces 2) +set(config_uavcan_num_ifaces 1) set(config_module_list # diff --git a/nuttx-configs/mindpx-v2/include/board.h b/nuttx-configs/mindpx-v2/include/board.h index 8449510e33..fdb3c64253 100644 --- a/nuttx-configs/mindpx-v2/include/board.h +++ b/nuttx-configs/mindpx-v2/include/board.h @@ -93,7 +93,7 @@ * * PLL source is HSE * PLL_VCO = (STM32_HSE_FREQUENCY / PLLM) * PLLN - * = (25,000,000 / 25) * 336 + * = (8,000,000 / 8) * 336 * = 336,000,000 * SYSCLK = PLL_VCO / PLLP * = 336,000,000 / 2 = 168,000,000 @@ -231,12 +231,9 @@ * CAN * * CAN1 is routed to the onboard transceiver. - * CAN2 is routed to the expansion connector. */ #define GPIO_CAN1_RX GPIO_CAN1_RX_3 #define GPIO_CAN1_TX GPIO_CAN1_TX_3 -#define GPIO_CAN2_RX GPIO_CAN2_RX_1 -#define GPIO_CAN2_TX GPIO_CAN2_TX_2 /* * I2C