Skip to content

Commit 6daa579

Browse files
AlexKlimajdagar
authored andcommitted
Add ARK RTK GPS Debug, turn on UART RX DMA
1 parent 21163d8 commit 6daa579

File tree

5 files changed

+25
-4
lines changed

5 files changed

+25
-4
lines changed

.vscode/cmake-variants.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,11 @@ CONFIG:
106106
buildType: MinSizeRel
107107
settings:
108108
CONFIG: ark_can-rtk-gps_default
109+
ark_can-rtk-gps_debug:
110+
short: ark_can-rtk-gps_debug
111+
buildType: MinSizeRel
112+
settings:
113+
CONFIG: ark_can-rtk-gps_debug
109114
ark_can-rtk-gps_canbootloader:
110115
short: ark_can-rtk-gps_canbootloader
111116
buildType: MinSizeRel
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
CONFIG_BOARD_CONSTRAINED_FLASH=n
2+
CONFIG_BOARD_NO_HELP=n
3+
CONFIG_BOARD_CONSTRAINED_MEMORY=y
4+
CONFIG_SYSTEMCMDS_TOP=y
5+
CONFIG_SYSTEMCMDS_REBOOT=y
6+
CONFIG_SYSTEMCMDS_UORB=y

boards/ark/can-rtk-gps/nuttx-config/include/board_dma_map.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,8 @@
3939

4040
// DMA2 Channel/Stream Selections
4141
//--------------------------------------------//---------------------------//----------------
42-
#define DMACHAN_SPI1_RX DMAMAP_SPI1_RX_2 // DMA2, Stream 2, Channel 3
43-
#define DMACHAN_SPI1_TX DMAMAP_SPI1_TX_1 // DMA2, Stream 5, Channel 3
42+
#define DMACHAN_SPI1_RX DMAMAP_SPI1_RX_1 // DMA2, Stream 0, Channel 3
43+
#define DMACHAN_SPI1_TX DMAMAP_SPI1_TX_1 // DMA2, Stream 3, Channel 3
44+
#define DMACHAN_USART1_RX DMAMAP_USART1_RX_1 // DMA2, Stream 2, Channel 4
45+
#define DMAMAP_USART1_RX DMAMAP_USART1_RX_1
46+
//#define DMACHAN_USART1_TX DMAMAP_USART1_TX // DMA2, Stream 7, Channel 4

boards/ark/can-rtk-gps/nuttx-config/nsh/defconfig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,9 @@ CONFIG_STM32_WWDG=y
150150
CONFIG_SYSTEM_NSH=y
151151
CONFIG_TASK_NAME_SIZE=24
152152
CONFIG_USART1_BAUD=57600
153-
CONFIG_USART1_RXBUFSIZE=600
154-
CONFIG_USART1_TXBUFSIZE=1100
153+
CONFIG_USART1_RXBUFSIZE=2000
154+
CONFIG_USART1_RXDMA=y
155+
CONFIG_USART1_TXBUFSIZE=2000
155156
CONFIG_USART2_BAUD=57600
156157
CONFIG_USART2_RXBUFSIZE=600
157158
CONFIG_USART2_SERIAL_CONSOLE=y

boards/ark/can-rtk-gps/src/init.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,12 @@ __EXPORT int board_app_initialize(uintptr_t arg)
139139
{
140140
px4_platform_init();
141141

142+
#if defined(SERIAL_HAVE_RXDMA)
143+
// set up the serial DMA polling at 1ms intervals for received bytes that have not triggered a DMA event.
144+
static struct hrt_call serial_dma_call;
145+
hrt_call_every(&serial_dma_call, 1000, 1000, (hrt_callout)stm32_serial_dma_poll, NULL);
146+
#endif
147+
142148
#if defined(FLASH_BASED_PARAMS)
143149
static sector_descriptor_t params_sector_map[] = {
144150
{2, 16 * 1024, 0x08008000},

0 commit comments

Comments
 (0)