rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00
Code Issues Releases Activity

Merge branch 'master' of github.com:arduino/ARM

Browse Source
This commit is contained in:
Cristian Maglie 2012-09-25 19:51:35 +02:00
commit cfa77a2436
8 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/processing/app/debug/BasicUploader.java
View File

@ -198,7 +198,7 @@ public class BasicUploader extends Uploader {
// Something happened while detecting port
throw new RunnerException(
_("Couldn’t find a Leonardo on the selected port. Check that you have the correct port selected. If it is correct, try pressing the board's reset button after initiating the upload."));
_("Couldn't find a Board on the selected port. Check that you have the correct port selected. If it is correct, try pressing the board's reset button after initiating the upload."));
}
public boolean uploadUsingProgrammer(String buildPath, String className)

4
hardware/arduino/sam/cores/arduino/USB/CDC.cpp
View File

@ -252,6 +252,10 @@ size_t Serial_::write(uint8_t c) {
// where the port is configured (lineState != 0) but not quite opened.
Serial_::operator bool()
{
// this is here to avoid spurious opening after upload
if (millis() < 500)
return false;
bool result = false;
if (_usbLineInfo.lineState > 0)

1
libraries/SD/examples/CardInfo/CardInfo.ino
View File

@ -20,6 +20,7 @@
by Tom Igoe
*/
// include the SD library:
#include <SPI.h>
#include <SD.h>
// set up variables using the SD utility library functions:

1
libraries/SD/examples/Datalogger/Datalogger.ino
View File

@ -20,6 +20,7 @@
*/
#include <SPI.h>
#include <SD.h>
// On the Ethernet Shield, CS is pin 4. Note that even if it's not

1
libraries/SD/examples/DumpFile/DumpFile.ino
View File

@ -20,6 +20,7 @@
*/
#include <SPI.h>
#include <SD.h>
// On the Ethernet Shield, CS is pin 4. Note that even if it's not

1
libraries/SD/examples/Files/Files.ino
View File

@ -17,6 +17,7 @@
This example code is in the public domain.
*/
#include <SPI.h>
#include <SD.h>
File myFile;

1
libraries/SD/examples/ReadWrite/ReadWrite.ino
View File

@ -18,6 +18,7 @@
*/
#include <SPI.h>
#include <SD.h>
File myFile;

1
libraries/SD/examples/listfiles/listfiles.ino
View File

@ -17,6 +17,7 @@
This example code is in the public domain.
*/
#include <SPI.h>
#include <SD.h>
File root;