diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/usart.c | 8 | ||||
-rw-r--r-- | src/main.cpp | 22 |
2 files changed, 24 insertions, 6 deletions
diff --git a/src/lib/usart.c b/src/lib/usart.c index a06690e..76685fd 100644 --- a/src/lib/usart.c +++ b/src/lib/usart.c @@ -83,7 +83,12 @@ void USART2_IRQHandler(void) { ring_buf2.buf[ring_buf2.tail++] = (uint8_t)(((usart_port*)(USART2_BASE))->DR); ring_buf2.tail %= USART_RECV_BUF_SIZE; } - +/* Don't overrun your buffer, seriously */ +void USART3_IRQHandler(void) { + /* Read the data */ + ring_buf3.buf[ring_buf2.tail++] = (uint8_t)(((usart_port*)(USART3_BASE))->DR); + ring_buf3.tail %= USART_RECV_BUF_SIZE; +} /** * @brief Enable a USART in single buffer transmission mode, multibuffer @@ -124,6 +129,7 @@ void usart_init(uint8 usart_num, uint32 baud) { port = (usart_port*)USART3_BASE; ring_buf = &ring_buf3; clk_speed = USART3_CLK; + RCC_APB1PeriphClockCmd(RCC_APB1Periph_USART3, ENABLE); break; default: /* should never get here */ diff --git a/src/main.cpp b/src/main.cpp index b260bd0..edd4fbb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,19 +1,31 @@ #include "wiring.h"
#include "HardwareSerial.h"
#include "wiring_math.h"
+#include "HardwareUsb.h"
#include "usb.h"
+//HardwareUsb USB;
+
int ledPin = 13;
-int toggle=0;
void setup() {
pinMode(ledPin,OUTPUT);
+ Serial2.begin(9600);
+ Serial3.begin(9600);
}
+volatile int toggle = 1;
+
void loop() {
- digitalWrite(ledPin, HIGH);
- delay(1000);
- digitalWrite(ledPin,LOW);
- delay(1000);
+ digitalWrite(ledPin, toggle);
+ toggle ^= 1;
+ delay(500);
+// USB.print(millis());
+// USB.println("\r");
+ Serial2.print(millis(), DEC);
+ Serial3.print(millis(), DEC);
+ Serial3.print(": ");
+// Serial3.print(USB.available(), DEC);
+ Serial3.println();
}
int main(void) {
|