Skip to content

Commit fd94e18

Browse files
committedJul 24, 2014
Merge remote-tracking branch 'arduino/master' into ide-1.5.x
2 parents 8131af9 + 163b60e commit fd94e18

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed
 

‎hardware/arduino/avr/cores/arduino/HID.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ const u8 _hidReportDescriptor[] = {
106106
0x81, 0x00, // INPUT (Data,Ary,Abs)
107107
0xc0, // END_COLLECTION
108108

109-
#if RAWHID_ENABLED
109+
#ifdef RAWHID_ENABLED
110110
// RAW HID
111111
0x06, LSB(RAWHID_USAGE_PAGE), MSB(RAWHID_USAGE_PAGE), // 30
112112
0x0A, LSB(RAWHID_USAGE), MSB(RAWHID_USAGE),

‎libraries/LiquidCrystal/examples/HelloWorld/HelloWorld.ino

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
* LCD D6 pin to digital pin 3
1818
* LCD D7 pin to digital pin 2
1919
* LCD R/W pin to ground
20+
* LCD VSS pin to ground
21+
* LCD VCC pin to 5V
2022
* 10K resistor:
2123
* ends to +5V and ground
2224
* wiper to LCD VO pin (pin 3)

‎libraries/LiquidCrystal/src/LiquidCrystal.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ void LiquidCrystal::begin(uint8_t cols, uint8_t lines, uint8_t dotsize) {
9696

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

0 commit comments

Comments
 (0)
Please sign in to comment.