diff --git a/boards/px4/fts-can/nuttx-config/bootloader/defconfig b/boards/px4/fts-can/nuttx-config/bootloader/defconfig index 3db4f01..4ccda1e 100644 --- a/boards/px4/fts-can/nuttx-config/bootloader/defconfig +++ b/boards/px4/fts-can/nuttx-config/bootloader/defconfig @@ -32,11 +32,11 @@ CONFIG_BOARD_RESET_ON_ASSERT=2 CONFIG_CDCACM=y CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0038 -CONFIG_CDCACM_PRODUCTSTR="NIMBUS FTS-CAN" +CONFIG_CDCACM_PRODUCTSTR="FTS-CAN" CONFIG_CDCACM_RXBUFSIZE=600 CONFIG_CDCACM_TXBUFSIZE=12000 CONFIG_CDCACM_VENDORID=0x3185 -CONFIG_CDCACM_VENDORSTR="Auterion" +CONFIG_CDCACM_VENDORSTR="Nimbus" CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEBUG_TCBINFO=y diff --git a/boards/px4/fts-can/nuttx-config/nsh/defconfig b/boards/px4/fts-can/nuttx-config/nsh/defconfig index 1fb11e7..e2601c0 100644 --- a/boards/px4/fts-can/nuttx-config/nsh/defconfig +++ b/boards/px4/fts-can/nuttx-config/nsh/defconfig @@ -75,11 +75,11 @@ CONFIG_BUILTIN=y CONFIG_CDCACM=y CONFIG_CDCACM_IFLOWCONTROL=y CONFIG_CDCACM_PRODUCTID=0x0038 -CONFIG_CDCACM_PRODUCTSTR="NIMBUS FTS-CAN" +CONFIG_CDCACM_PRODUCTSTR="FTS-CAN" CONFIG_CDCACM_RXBUFSIZE=600 CONFIG_CDCACM_TXBUFSIZE=12000 CONFIG_CDCACM_VENDORID=0x3185 -CONFIG_CDCACM_VENDORSTR="Auterion" +CONFIG_CDCACM_VENDORSTR="Nimbus" CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_HARDFAULT_ALERT=y CONFIG_DEBUG_MEMFAULT=y diff --git a/boards/px4/fts-can/src/board_config.h b/boards/px4/fts-can/src/board_config.h index fb5382c..d69d253 100644 --- a/boards/px4/fts-can/src/board_config.h +++ b/boards/px4/fts-can/src/board_config.h @@ -57,7 +57,7 @@ #undef TRACE_PINS /* PX4IO connection configuration */ - +/* #define BOARD_USES_PX4IO_VERSION 2 #define PX4IO_SERIAL_DEVICE "/dev/ttyS4" #define PX4IO_SERIAL_TX_GPIO GPIO_USART6_TX @@ -69,8 +69,8 @@ #define PX4IO_SERIAL_RCC_REG STM32_RCC_APB2ENR #define PX4IO_SERIAL_RCC_EN RCC_APB2ENR_USART6EN #define PX4IO_SERIAL_CLOCK STM32_PCLK2_FREQUENCY -#define PX4IO_SERIAL_BITRATE 1500000 /* 1.5Mbps -> max rate for IO */ - +#define PX4IO_SERIAL_BITRATE 1500000 // 1.5Mbps -> max rate for IO +*/ /* PX4FMU GPIOs ***********************************************************************************/ diff --git a/boards/px4/fts-can/src/manifest.c b/boards/px4/fts-can/src/manifest.c index 4a0401b..5e89cb9 100644 --- a/boards/px4/fts-can/src/manifest.c +++ b/boards/px4/fts-can/src/manifest.c @@ -73,18 +73,6 @@ static const px4_hw_mft_item_t device_unsupported = {0, 0, 0}; // List of components on a specific board configuration // The index of those components is given by the enum (px4_hw_mft_item_id_t) // declared in board_common.h -static const px4_hw_mft_item_t hw_mft_list_v0600[] = { - { - .present = 1, - .mandatory = 1, - .connection = px4_hw_con_onboard, - }, - { - .present = 1, - .mandatory = 1, - .connection = px4_hw_con_onboard, - }, -}; static const px4_hw_mft_item_t hw_mft_list_v0610[] = { { @@ -102,11 +90,7 @@ static const px4_hw_mft_item_t hw_mft_list_v0610[] = { static px4_hw_mft_list_entry_t mft_lists[] = { // ver_rev - {V6C00, hw_mft_list_v0600, arraySize(hw_mft_list_v0600)}, // Rev 0 - {V6C01, hw_mft_list_v0600, arraySize(hw_mft_list_v0600)}, // Rev 1 {V6C10, hw_mft_list_v0610, arraySize(hw_mft_list_v0610)}, // Rev 0 No PX4IO - {V6C11, hw_mft_list_v0610, arraySize(hw_mft_list_v0610)}, // Rev 1 No PX4IO - {V6C21, hw_mft_list_v0600, arraySize(hw_mft_list_v0600)}, // Rev 1 MINI }; /************************************************************************************ diff --git a/bootloader_flash.sh b/bootloader_flash.sh new file mode 100755 index 0000000..f5db419 --- /dev/null +++ b/bootloader_flash.sh @@ -0,0 +1,4 @@ +#!/bin/bash -xe + +# flash bootloader +st-flash write build/px4_fts-can_bootloader/px4_fts-can_bootloader.bin 0x08000000 \ No newline at end of file diff --git a/firmware_flash.sh b/firmware_flash.sh new file mode 100755 index 0000000..a4965a1 --- /dev/null +++ b/firmware_flash.sh @@ -0,0 +1,4 @@ +#!/bin/bash -xe + +# flash bootloader +st-flash write build/px4_fts-can_default/px4_fts-can_default.bin 0x08020000 \ No newline at end of file diff --git a/init.sh b/init.sh new file mode 100755 index 0000000..9d8d036 --- /dev/null +++ b/init.sh @@ -0,0 +1,3 @@ +#!/bin/bash -xe + +sudo apt install stlink-tools \ No newline at end of file diff --git a/stflash.sh b/stflash.sh deleted file mode 100755 index 4d8c783..0000000 --- a/stflash.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -xe - -st-flash \ No newline at end of file