noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changed baudrate for auto-reset-and-upload back to 1200 bps. specified arduino protocol for Leonardo avrdude upload.

This commit is contained in:
Zach Eveland 2011-09-05 13:08:05 -04:00
parent e24e9499cf
commit 5e058a8aa3
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hardware/arduino/boards.txt
View File

@ -1,9 +1,9 @@
############################################################## ##############################################################
leonardo.name=Arduino Leonardo leonardo.name=Arduino Leonardo
leonardo.upload.protocol=stk500 leonardo.upload.protocol=arduino
leonardo.upload.maximum_size=30720 leonardo.upload.maximum_size=30720
leonardo.upload.speed=300 leonardo.upload.speed=1200
leonardo.bootloader.low_fuses=0xde leonardo.bootloader.low_fuses=0xde
leonardo.bootloader.high_fuses=0xd8 leonardo.bootloader.high_fuses=0xd8
leonardo.bootloader.extended_fuses=0xf3 leonardo.bootloader.extended_fuses=0xf3

2
hardware/arduino/cores/arduino/CDC.cpp
View File

@ -95,7 +95,7 @@ bool WEAK CDC_Setup(Setup& setup)
if (CDC_SET_LINE_CODING == r) if (CDC_SET_LINE_CODING == r)
{ {
USB_RecvControl((void*)&_usbLineInfo,7); USB_RecvControl((void*)&_usbLineInfo,7);
if (300 == _usbLineInfo.dwDTERate) // auto-reset is triggered when avrdude opens the port at 1200 bps if (1200 == _usbLineInfo.dwDTERate) // auto-reset is triggered when avrdude opens the port at 1200 bps
Reboot(); Reboot();
return true; return true;

9
hardware/arduino/cores/arduino/HardwareSerial.cpp
View File

@ -167,11 +167,6 @@ inline void store_char(unsigned char c, ring_buffer *buffer)
#error SIG_USART3_RECV #error SIG_USART3_RECV
#endif #endif
<<<<<<< HEAD
#if !defined(USART0_UDRE_vect) && defined(USART1_UDRE_vect)
// do nothing - on the 32u4 the first USART is USART1
#else
=======
void serialEventRun(void) void serialEventRun(void)
{ {
unsigned char flag, oldSREG; unsigned char flag, oldSREG;
@ -210,7 +205,9 @@ void serialEventRun(void)
} }
>>>>>>> 0c92f230b5202b241de875a3baff9dfd1cf7a618 #if !defined(USART0_UDRE_vect) && defined(USART1_UDRE_vect)
// do nothing - on the 32u4 the first USART is USART1
#else
#if !defined(UART0_UDRE_vect) && !defined(UART_UDRE_vect) && !defined(USART0_UDRE_vect) && !defined(USART_UDRE_vect) #if !defined(UART0_UDRE_vect) && !defined(UART_UDRE_vect) && !defined(USART0_UDRE_vect) && !defined(USART_UDRE_vect)
#error Don't know what the Data Register Empty vector is called for the first UART #error Don't know what the Data Register Empty vector is called for the first UART
#else #else