From c9a78942303084c27246c2acfc5d1cdd86bb12a2 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sun, 26 Jul 2020 21:35:46 -0400
Subject: [PATCH] boards: bitcraze crazyflie fix boot

 - add console to USART3 for now
---
 .vscode/cmake-variants.yaml                    |  5 +++++
 boards/bitcraze/crazyflie/default.cmake        |  2 +-
 .../crazyflie/nuttx-config/nsh/defconfig       | 18 ++++++++++--------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.vscode/cmake-variants.yaml b/.vscode/cmake-variants.yaml
index 281b4d47f6..f99973b7ad 100644
--- a/.vscode/cmake-variants.yaml
+++ b/.vscode/cmake-variants.yaml
@@ -61,6 +61,11 @@ CONFIG:
       buildType: MinSizeRel
       settings:
         CONFIG: av_x-v1_default
+    bitcraze_crazyflie_default:
+      short: bitcraze_crazyflie
+      buildType: MinSizeRel
+      settings:
+        CONFIG: bitcraze_crazyflie_default
     cuav_can-gps-v1_default:
       short: cuav_can-gps-v1_default
       buildType: MinSizeRel
diff --git a/boards/bitcraze/crazyflie/default.cmake b/boards/bitcraze/crazyflie/default.cmake
index cad7feebb7..3ca6546f43 100644
--- a/boards/bitcraze/crazyflie/default.cmake
+++ b/boards/bitcraze/crazyflie/default.cmake
@@ -37,7 +37,7 @@ px4_add_board(
 		sensors
 		#temperature_compensation
 	SYSTEMCMDS
-		bl_update
+		#bl_update
 		dmesg
 		dumpfile
 		esc_calib
diff --git a/boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig b/boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig
index 50dd88a278..6bd576f3f7 100644
--- a/boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig
+++ b/boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig
@@ -12,6 +12,7 @@
 # CONFIG_MMCSD_MMCSUPPORT is not set
 # CONFIG_NSH_DISABLEBG is not set
 # CONFIG_NSH_DISABLESCRIPT is not set
+# CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
 # CONFIG_NSH_DISABLE_GET is not set
@@ -43,10 +44,11 @@ CONFIG_C99_BOOL8=y
 CONFIG_CDCACM=y
 CONFIG_CDCACM_PRODUCTID=0x0016
 CONFIG_CDCACM_PRODUCTSTR="PX4 Crazyflie v2.0"
-CONFIG_CDCACM_RXBUFSIZE=300
-CONFIG_CDCACM_TXBUFSIZE=1000
+CONFIG_CDCACM_RXBUFSIZE=600
+CONFIG_CDCACM_TXBUFSIZE=2000
 CONFIG_CDCACM_VENDORID=0x26ac
 CONFIG_CDCACM_VENDORSTR="Bitcraze AB"
+CONFIG_CLOCK_MONOTONIC=y
 CONFIG_DEBUG_FULLOPT=y
 CONFIG_DEBUG_HARDFAULT_ALERT=y
 CONFIG_DEBUG_SYMBOLS=y
@@ -54,6 +56,7 @@ CONFIG_DEFAULT_SMALL=y
 CONFIG_DEV_FIFO_SIZE=0
 CONFIG_DEV_PIPE_MAXSIZE=1024
 CONFIG_DEV_PIPE_SIZE=70
+CONFIG_DISABLE_MQUEUE=y
 CONFIG_FAT_DIRECT_RETRY=y
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
@@ -62,11 +65,10 @@ CONFIG_FDCLONE_STDIO=y
 CONFIG_FS_BINFS=y
 CONFIG_FS_CROMFS=y
 CONFIG_FS_FAT=y
+CONFIG_FS_FATTIME=y
 CONFIG_FS_PROCFS=y
-CONFIG_FS_PROCFS_EXCLUDE_BLOCKS=y
-CONFIG_FS_PROCFS_EXCLUDE_MEMINFO=y
-CONFIG_FS_PROCFS_EXCLUDE_MOUNT=y
-CONFIG_FS_PROCFS_EXCLUDE_USAGE=y
+CONFIG_FS_PROCFS_INCLUDE_PROGMEM=y
+CONFIG_FS_PROCFS_REGISTER=y
 CONFIG_FS_ROMFS=y
 CONFIG_GRAN=y
 CONFIG_GRAN_INTR=y
@@ -92,7 +94,6 @@ CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDPARMS=y
 CONFIG_NSH_CROMFSETC=y
-CONFIG_NSH_DISABLE_EXPORT=y
 CONFIG_NSH_DISABLE_IFCONFIG=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
 CONFIG_NSH_DISABLE_MB=y
@@ -177,7 +178,8 @@ CONFIG_USART2_BAUD=57600
 CONFIG_USART2_RXBUFSIZE=300
 CONFIG_USART2_RXDMA=y
 CONFIG_USART2_TXBUFSIZE=300
-CONFIG_USART3_RXDMA=y
+CONFIG_USART3_BAUD=57600
+CONFIG_USART3_SERIAL_CONSOLE=y
 CONFIG_USART6_BAUD=57600
 CONFIG_USART6_RXBUFSIZE=128
 CONFIG_USART6_RXDMA=y