Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Per Jose, fix the interrupt vectors to work for non-1280-based Arduino.

Browse Source 
Make Serial0 also stdin and stderr.



git-svn-id: https://arducopter.googlecode.com/svn/trunk@534 f9c3cf11-9bcb-44bc-f272-b75c42450872
This commit is contained in:
DrZiplok@gmail.com 2010-09-22 03:00:10 +00:00
parent 9d8ea2563f
commit 6d31545b8d
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/FastSerial/FastSerial.cpp
View File

@ -105,8 +105,11 @@ FastSerial::FastSerial(const uint8_t portNumber,
// init stdio // init stdio
fdev_setup_stream(&_fd, &FastSerial::_putchar, NULL, _FDEV_SETUP_WRITE); fdev_setup_stream(&_fd, &FastSerial::_putchar, NULL, _FDEV_SETUP_WRITE);
fdev_set_udata(&_fd, this); fdev_set_udata(&_fd, this);
if (0 == portNumber) if (0 == portNumber) {
stdout = &_fd; // serial port 0 is always the default console stdout = &_fd; // serial port 0 is always the default console
stdin = &_fd;
stderr = &_fd;
}
} }
// Public Methods ////////////////////////////////////////////////////////////// // Public Methods //////////////////////////////////////////////////////////////

30
libraries/FastSerial/FastSerial.h
View File

@ -180,7 +180,7 @@ ISR(_TXVECTOR, ISR_BLOCK) \
struct hack struct hack
// Macros defining serial ports // Macros defining serial ports
// XXX note no ATMega8 support here... #if defined(__AVR_ATmega1280__)
#define FastSerialPort0(_portName) \ #define FastSerialPort0(_portName) \
FastSerial _portName(0, \ FastSerial _portName(0, \
&UBRR0H, \ &UBRR0H, \
@ -192,7 +192,6 @@ struct hack
(_BV(RXEN0) | _BV(TXEN0) | _BV(RXCIE0)), \ (_BV(RXEN0) | _BV(TXEN0) | _BV(RXCIE0)), \
(_BV(UDRIE0))); \ (_BV(UDRIE0))); \
FastSerialHandler(0, SIG_USART0_RECV, SIG_USART0_DATA, UDR0, UCSR0B, _BV(UDRIE0)) FastSerialHandler(0, SIG_USART0_RECV, SIG_USART0_DATA, UDR0, UCSR0B, _BV(UDRIE0))
#if defined(__AVR_ATmega1280__)
#define FastSerialPort1(_portName) \ #define FastSerialPort1(_portName) \
FastSerial _portName(1, \ FastSerial _portName(1, \
&UBRR1H, \ &UBRR1H, \
@ -226,6 +225,33 @@ struct hack
(_BV(RXEN3) | _BV(TXEN3) | _BV(RXCIE3)), \ (_BV(RXEN3) | _BV(TXEN3) | _BV(RXCIE3)), \
(_BV(UDRIE3))); \ (_BV(UDRIE3))); \
FastSerialHandler(3, SIG_USART3_RECV, SIG_USART3_DATA, UDR3, UCSR3B, _BV(UDRIE3)) FastSerialHandler(3, SIG_USART3_RECV, SIG_USART3_DATA, UDR3, UCSR3B, _BV(UDRIE3))
#else
#if defined(__AVR_ATmega8__)
#define FastSerialPort0(_portName) \
FastSerial _portName(0, \
&UBRR0H, \
&UBRR0L, \
&UCSR0A, \
&UCSR0B, \
&UDR0, \
U2X0, \
(_BV(RXEN0) | _BV(TXEN0) | _BV(RXCIE0)), \
(_BV(UDRIE0))); \
FastSerialHandler(0, SIG_UART_RECV, SIG_UART_DATA, UDR0, UCSR0B, _BV(UDRIE0))
#else
// note no SIG_USART_* defines for the 168, 328, etc.
#define FastSerialPort0(_portName) \
FastSerial _portName(0, \
&UBRR0H, \
&UBRR0L, \
&UCSR0A, \
&UCSR0B, \
&UDR0, \
U2X0, \
(_BV(RXEN0) | _BV(TXEN0) | _BV(RXCIE0)), \
(_BV(UDRIE0))); \
FastSerialHandler(0, USART_RX_vect, USART_UDRE_vect, UDR0, UCSR0B, _BV(UDRIE0))
#endif
#endif #endif
#endif // FastSerial_h #endif // FastSerial_h