mirror of
https://github.com/esp8266/Arduino.git
synced 2025-10-12 12:44:53 +03:00
Merge branch 'master' into ide-1.5.x
Conflicts: build/shared/examples/02.Digital/BlinkWithoutDelay/BlinkWithoutDelay.ino build/shared/examples/09.USB/Keyboard/KeyboardMessage/KeyboardMessage.ino libraries/LiquidCrystal/examples/CustomCharacter/CustomCharacter.ino libraries/SD/examples/listfiles/listfiles.ino
This commit is contained in:
@@ -21,9 +21,12 @@
|
||||
* ends to +5V and ground
|
||||
* wiper to LCD VO pin (pin 3)
|
||||
* 10K poterntiometer on pin A0
|
||||
|
||||
created21 Mar 2011
|
||||
|
||||
created 21 Mar 2011
|
||||
by Tom Igoe
|
||||
modified 11 Nov 2013
|
||||
by Scott Fitzgerald
|
||||
|
||||
Based on Adafruit's example at
|
||||
https://github.com/adafruit/SPI_VFD/blob/master/examples/createChar/createChar.pde
|
||||
|
||||
@@ -96,7 +99,11 @@ byte armsUp[8] = {
|
||||
0b00100,
|
||||
0b01010
|
||||
};
|
||||
|
||||
void setup() {
|
||||
// initialize LCD and set up the number of columns and rows:
|
||||
lcd.begin(16, 2);
|
||||
|
||||
// create a new character
|
||||
lcd.createChar(0, heart);
|
||||
// create a new character
|
||||
@@ -108,11 +115,9 @@ void setup() {
|
||||
// create a new character
|
||||
lcd.createChar(4, armsUp);
|
||||
|
||||
// set up the lcd's number of columns and rows:
|
||||
lcd.begin(16, 2);
|
||||
// Print a message to the lcd.
|
||||
lcd.print("I ");
|
||||
lcd.write((byte) 0);
|
||||
lcd.print("I ");
|
||||
lcd.write(byte(0)); // when calling lcd.write() '0' must be cast as a byte
|
||||
lcd.print(" Arduino! ");
|
||||
lcd.write((byte) 1);
|
||||
|
||||
@@ -133,6 +138,3 @@ void loop() {
|
||||
lcd.write(4);
|
||||
delay(delayTime);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user