From 8133c7b8c11f10c4ca306af5716b2d16233d962b Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Mon, 20 Mar 2017 15:06:39 +0100 Subject: [PATCH] update --- CleanSerial | 2 +- client/halconf.h | 2 +- client/interface.c | 13 +++++++++++-- client/mcuconf.h | 6 +++--- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/CleanSerial b/CleanSerial index 51fb89d..27239bb 160000 --- a/CleanSerial +++ b/CleanSerial @@ -1 +1 @@ -Subproject commit 51fb89d38cf4fc3231f32da3fc8bc174eb05a1ab +Subproject commit 27239bb503b5bd185a37e2bbf165b7192985efa2 diff --git a/client/halconf.h b/client/halconf.h index e556d48..1275a5f 100644 --- a/client/halconf.h +++ b/client/halconf.h @@ -294,7 +294,7 @@ * default configuration. */ #if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__) -#define SERIAL_DEFAULT_BITRATE 9600 +#define SERIAL_DEFAULT_BITRATE 38400 #endif /** diff --git a/client/interface.c b/client/interface.c index fae81db..59e750e 100644 --- a/client/interface.c +++ b/client/interface.c @@ -11,17 +11,20 @@ //Globals bool input_available(void) { + //return iqGetFullI(&(&SD6)->iqueue)>0; return iqGetFullI(&(&SD3)->iqueue)>0; } uint8_t read_byte(void) { return (uint8_t)sdGet(&SD3); + //return (uint8_t)sdGet(&SD6); } void write_byte(uint8_t b) { sdPut(&SD3, b); + //sdPut(&SD6, b); } uint64_t dpins[] = {LINE_ARD_D0, LINE_ARD_D1, LINE_ARD_D2, LINE_ARD_D3, @@ -83,12 +86,18 @@ void delay(long ms) void setup(void) { + palSetPadMode(GPIOG, 9, PAL_MODE_ALTERNATE(8)); // USART6 TX + palSetPadMode(GPIOG, 14, PAL_MODE_ALTERNATE(8)); // USART6 RX + halInit(); chSysInit(); sdStart(&SD3, NULL); - sdStart(&SD1, NULL); +// sdStart(&SD6, NULL); - +// while(1){ +// sdPut(&SD3, sdGet(&SD6)); +// delay(50); +// } } void debug(char *fmt, ...) diff --git a/client/mcuconf.h b/client/mcuconf.h index b01b315..642989f 100644 --- a/client/mcuconf.h +++ b/client/mcuconf.h @@ -264,12 +264,12 @@ /* * SERIAL driver system settings. */ -#define STM32_SERIAL_USE_USART1 TRUE +#define STM32_SERIAL_USE_USART1 FALSE #define STM32_SERIAL_USE_USART2 FALSE #define STM32_SERIAL_USE_USART3 TRUE #define STM32_SERIAL_USE_UART4 FALSE #define STM32_SERIAL_USE_UART5 FALSE -#define STM32_SERIAL_USE_USART6 FALSE +#define STM32_SERIAL_USE_USART6 TRUE #define STM32_SERIAL_USE_UART7 FALSE #define STM32_SERIAL_USE_UART8 FALSE #define STM32_SERIAL_USART1_PRIORITY 12 @@ -330,7 +330,7 @@ #define STM32_UART_USE_USART3 FALSE #define STM32_UART_USE_UART4 FALSE #define STM32_UART_USE_UART5 FALSE -#define STM32_UART_USE_USART6 FALSE +#define STM32_UART_USE_USART6 TRUE #define STM32_UART_USE_UART7 FALSE #define STM32_UART_USE_UART8 FALSE #define STM32_UART_USART1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 5) -- 2.20.1