Permalink
Browse files

Merge branch 'master' of git://github.com/nseidle/OpenLog. Merged ups…

…tream changes http://github.com/ringp/OpenLog/commit/4a1c0da2386db63195fe0a6cc3055386945e0ffe.

Conflicts:
	OpenLog_v2/OpenLog_v2.pde
	OpenLog_v2/SdFile.cpp
  • Loading branch information...
2 parents 1d5689a + 57890b6 commit 1aecc0352263aff9a9dcde4167f2338c0e2d0d57 Paul Ring committed Oct 27, 2010
@@ -50,7 +50,7 @@ void setup()
void loop()
{
- int testAmt = 4;
+ int testAmt = 10;
//At 9600, testAmt of 4 takes about 1 minute, 10 takes about 3 minutes
//At 57600, testAmt of 10 takes about 1 minute, 40 takes about 5 minutes
//testAmt of 10 will push 111,000 characters/bytes. With header and footer strings, total is 111,052
@@ -73,6 +73,12 @@ void loop()
Serial.println(":abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-!#");
//delay(50);
}
+
+ if(digitalRead(ledPin) == 0)
+ digitalWrite(ledPin, HIGH);
+ else
+ digitalWrite(ledPin, LOW);
+
}
}
Oops, something went wrong.

0 comments on commit 1aecc03

Please sign in to comment.