Skip to content

Fix of a bug #2199 #2206

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.

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
Jul 24, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions hardware/arduino/cores/arduino/HID.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ const u8 _hidReportDescriptor[] = {
0x81, 0x00, // INPUT (Data,Ary,Abs)
0xc0, // END_COLLECTION

#if RAWHID_ENABLED
#ifdef RAWHID_ENABLED
// RAW HID
0x06, LSB(RAWHID_USAGE_PAGE), MSB(RAWHID_USAGE_PAGE), // 30
0x0A, LSB(RAWHID_USAGE), MSB(RAWHID_USAGE),
Expand Down Expand Up @@ -517,4 +517,4 @@ size_t Keyboard_::write(uint8_t c)

#endif

#endif /* if defined(USBCON) */
#endif /* if defined(USBCON) */
2 changes: 1 addition & 1 deletion libraries/LiquidCrystal/LiquidCrystal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ void LiquidCrystal::begin(uint8_t cols, uint8_t lines, uint8_t dotsize) {

// SEE PAGE 45/46 FOR INITIALIZATION SPECIFICATION!
// according to datasheet, we need at least 40ms after power rises above 2.7V
// before sending commands. Arduino can turn on way befer 4.5V so we'll wait 50
// before sending commands. Arduino can turn on way before 4.5V so we'll wait 50
delayMicroseconds(50000);
// Now we pull both RS and R/W low to begin commands
digitalWrite(_rs_pin, LOW);
Expand Down