rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-07 01:54:26 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Browse Source
This commit is contained in:
Cristian Maglie 2014-07-24 14:46:05 +02:00
commit fd94e184a5
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/arduino/avr/cores/arduino/HID.cpp
View File

@ -106,7 +106,7 @@ const u8 _hidReportDescriptor[] = {
0x81, 0x00, // INPUT (Data,Ary,Abs) 0x81, 0x00, // INPUT (Data,Ary,Abs)
0xc0, // END_COLLECTION 0xc0, // END_COLLECTION
#if RAWHID_ENABLED #ifdef RAWHID_ENABLED
// RAW HID // RAW HID
0x06, LSB(RAWHID_USAGE_PAGE), MSB(RAWHID_USAGE_PAGE), // 30 0x06, LSB(RAWHID_USAGE_PAGE), MSB(RAWHID_USAGE_PAGE), // 30
0x0A, LSB(RAWHID_USAGE), MSB(RAWHID_USAGE), 0x0A, LSB(RAWHID_USAGE), MSB(RAWHID_USAGE),

2
libraries/LiquidCrystal/examples/HelloWorld/HelloWorld.ino
View File

@ -17,6 +17,8 @@
* LCD D6 pin to digital pin 3 * LCD D6 pin to digital pin 3
* LCD D7 pin to digital pin 2 * LCD D7 pin to digital pin 2
* LCD R/W pin to ground * LCD R/W pin to ground
* LCD VSS pin to ground
* LCD VCC pin to 5V
* 10K resistor: * 10K resistor:
* ends to +5V and ground * ends to +5V and ground
* wiper to LCD VO pin (pin 3) * wiper to LCD VO pin (pin 3)

2
libraries/LiquidCrystal/src/LiquidCrystal.cpp
View File

@ -96,7 +96,7 @@ void LiquidCrystal::begin(uint8_t cols, uint8_t lines, uint8_t dotsize) {
// SEE PAGE 45/46 FOR INITIALIZATION SPECIFICATION! // SEE PAGE 45/46 FOR INITIALIZATION SPECIFICATION!
// according to datasheet, we need at least 40ms after power rises above 2.7V // 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); delayMicroseconds(50000);
// Now we pull both RS and R/W low to begin commands // Now we pull both RS and R/W low to begin commands
digitalWrite(_rs_pin, LOW); digitalWrite(_rs_pin, LOW);