Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader

build/shared/examples/2.Digital/DigitalIputPullup/DigitalIputPullup.ino

@@ -0,0 +1,52 @@
+/*
+ Input Pullup Serial
+ 
+ This example demonstrates the use of pinMode(INPUT_PULLUP). It reads a 
+ digital input on pin 2 and prints the results to the serial monitor.
+ 
+ The circuit: 
+ * Momentary switch attached from pin 2 to ground 
+ * Built-in LED on pin 13
+ 
+ Unlike pinMode(INPUT), there is no pull-down resistor necessary. An internal 
+ 20K-ohm resistor is pulled to 5V. This configuration causes the input to 
+ read HIGH when the switch is open, and LOW when it is closed. 
+ 
+ created 14 March 2012
+ by Scott Fitzgerald
+ 
+ http://www.arduino.cc/en/Tutorial/InputPullupSerial
+ 
+ This example code is in the public domain
+ 
+ */
+
+void setup(){
+  //start serial connection
+  Serial.begin(9600);
+  //configure pin2 as an input and enable the internal pull-up resistor
+  pinMode(2, INPUT_PULLUP);
+  pinMode(13, OUTPUT); 
+
+}
+
+void loop(){
+  //read the pushbutton value into a variable
+  int sensorVal = digitalRead(2);
+  //print out the value of the pushbutton
+  Serial.println(sensorVal);
+  
+  // Keep in mind the pullup means the pushbutton's
+  // logic is inverted. It goes HIGH when it's open,
+  // and LOW when it's pressed. Turn on pin 13 when the 
+  // button's pressed, and off when it's not:
+  if (sensorVal == HIGH) {
+    digitalWrite(13, LOW);
+  } 
+  else {
+    digitalWrite(13, HIGH);
+  }
+}
+
+
+

build/shared/examples/ArduinoISP/ArduinoISP.ino

@@ -66,7 +66,7 @@
 void pulse(int pin, int times);
 
 void setup() {
-  Serial.begin(9600);
+  Serial.begin(19200);
   pinMode(LED_PMODE, OUTPUT);
   pulse(LED_PMODE, 2);
   pinMode(LED_ERR, OUTPUT);
@@ -109,7 +109,7 @@ void heartbeat() {
   if (hbval < 32) hbdelta = -hbdelta;
   hbval += hbdelta;
   analogWrite(LED_HB, hbval);
-  delay(40);
+  delay(20);
 }