1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-30 16:24:09 +03:00

Merge branch 'master' into ide-1.5.x

Conflicts:
	libraries/RobotIRremote/examples/IRrecord/IRrecord.ino
	libraries/RobotIRremote/examples/IRrecvDump/IRrecvDump.ino
	libraries/RobotIRremote/examples/IRrelay/IRrelay.ino
	libraries/RobotIRremote/examples/IRtest/IRtest.ino
	libraries/RobotIRremote/examples/IRtest2/IRtest2.ino
	libraries/RobotIRremote/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
	libraries/Robot_Control/examples/explore/R10_Rescue/R10_Rescue.ino
This commit is contained in:
Cristian Maglie
2013-11-14 16:04:45 +01:00
9 changed files with 3 additions and 904 deletions

View File

@ -59,19 +59,14 @@ void setup() {
// run the rescue sequence
rescueSequence();
Robot.text("Found obstacle", 5, 12);
// find the track again
goToNext();
Robot.text("Found track", 5, 19);
// run the rescue sequence a second time
rescueSequence();
Robot.text("Found obstacle", 5, 26);
// here you could go on ...
// write status on the screen
Robot.stroke(0, 0, 0);
Robot.text("Done!", 5, 25);
}
void loop() {