arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-09-11 05:52:31 +03:00
Code Activity

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

Browse Source 
Conflicts:
	build/shared/examples/01.Basics/Blink/Blink.ino
	build/shared/examples/09.USB/Keyboard/KeyboardReprogram/KeyboardReprogram.ino
	build/shared/examples/10.StarterKit/p02_SpaceshipInterface/p02_SpaceshipInterface.ino
	hardware/arduino/cores/arduino/HardwareSerial.cpp
This commit is contained in:
Cristian Maglie
2014-05-23 21:04:47 +02:00
parent e079baa18d fb8e439f3b
commit 5d92c1ba8e
5 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/shared/examples/10.StarterKit/p02_SpaceshipInterface/p02_SpaceshipInterface.ino
View File

@@ -44,7 +44,7 @@ void loop() {
switchstate = digitalRead(2);
// if the button is not pressed
// blink the red LEDs
// turn on the green LED and off the red LEDs
if (switchstate == LOW) {
digitalWrite(3, HIGH); // turn the green LED on pin 3 on
digitalWrite(4, LOW); // turn the red LED on pin 4 off
@@ -52,7 +52,7 @@ void loop() {
}
// this else is part of the above if() statement.
// if the switch is not LOW (the button is pressed)
// the code below will run
// turn off the green LED and blink alternatively the red LEDs
else {
digitalWrite(3, LOW); // turn the green LED on pin 3 off
digitalWrite(4, LOW); // turn the red LED on pin 4 off