Skip to content

USB CDC Serial_::begin fixes. #1563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 30, 2013
Merged

USB CDC Serial_::begin fixes. #1563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1162a45
USB serial baud arg type
pbrook Sep 2, 2013
f53fcdd
USB CDC two argument begin()
pbrook Sep 2, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion hardware/arduino/cores/arduino/CDC.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,11 @@ bool WEAK CDC_Setup(Setup& setup)


int _serialPeek = -1;
void Serial_::begin(uint16_t baud_count)
void Serial_::begin(unsigned long baud_count)
{
}

void Serial_::begin(unsigned long baud_count, byte config)
{
}

Expand Down
5 changes: 3 additions & 2 deletions hardware/arduino/cores/arduino/USBAPI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ class Serial_ : public Stream
private:
ring_buffer *_cdc_rx_buffer;
public:
void begin(uint16_t baud_count);
void begin(unsigned long);
void begin(unsigned long, uint8_t);
void end(void);

virtual int available(void);
Expand Down Expand Up @@ -193,4 +194,4 @@ void USB_Flush(uint8_t ep);

#endif

#endif /* if defined(USBCON) */
#endif /* if defined(USBCON) */