aboutsummaryrefslogtreecommitdiffstats
path: root/libmaple/util.c
diff options
context:
space:
mode:
authorbnewbold <bnewbold@robocracy.org>2010-08-05 21:47:12 -0400
committerbnewbold <bnewbold@robocracy.org>2010-08-05 21:47:22 -0400
commit0f55cc0d89dc018aa1a2e7ad1c926889f98ec26d (patch)
treeda21b7edba9b779591b56b6c08f0012ed2cbe31b /libmaple/util.c
parentccd9833f264d6e20a9f2c81baebe162f07eec996 (diff)
downloadlibrambutan-0f55cc0d89dc018aa1a2e7ad1c926889f98ec26d.tar.gz
librambutan-0f55cc0d89dc018aa1a2e7ad1c926889f98ec26d.zip
partial progress on FSMC for SRAM
Diffstat (limited to 'libmaple/util.c')
-rw-r--r--libmaple/util.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/libmaple/util.c b/libmaple/util.c
index 36173ee..8c25257 100644
--- a/libmaple/util.c
+++ b/libmaple/util.c
@@ -36,11 +36,11 @@
#include "adc.h"
#include "timers.h"
-#define ERROR_LED_PORT GPIOA_BASE
-#define ERROR_LED_PIN 5
-#define ERROR_USART_NUM 2
+#define ERROR_LED_PORT GPIOC_BASE
+#define ERROR_LED_PIN 15
+#define ERROR_USART_NUM 1
#define ERROR_USART_BAUD 9600
-#define ERROR_TX_PIN 2
+#define ERROR_TX_PIN 10
#define ERROR_TX_PORT GPIOA_BASE
/* Error assert + fade */
@@ -76,7 +76,8 @@ void _fail(const char* file, int line, const char* exp) {
usart_putstr(ERROR_USART_NUM, ": ");
usart_putudec(ERROR_USART_NUM, line);
usart_putc(ERROR_USART_NUM, '\n');
-
+ usart_putc(ERROR_USART_NUM, '\r');
+
/* Turn on the error LED */
gpio_set_mode(ERROR_LED_PORT, ERROR_LED_PIN, GPIO_MODE_OUTPUT_PP);