Merge branch 'master' into ide-1.5.x

arduino · Nov 3, 2013 · 3607c0b · 3607c0b
2 parents cdf9db8 + 9b519f2
commit 3607c0b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/hardware/arduino/avr/variants/ethernet/pins_arduino.h b/hardware/arduino/avr/variants/ethernet/pins_arduino.h
@@ -44,7 +44,7 @@ static const uint8_t SCK  = 13;
 
 static const uint8_t SDA = 18;
 static const uint8_t SCL = 19;
-static const uint8_t LED_BUILTIN = 9;
+#define LED_BUILTIN 9
 
 static const uint8_t A0 = 14;
 static const uint8_t A1 = 15;

diff --git a/hardware/arduino/avr/variants/leonardo/pins_arduino.h b/hardware/arduino/avr/variants/leonardo/pins_arduino.h
@@ -101,6 +101,7 @@
 
 static const uint8_t SDA = 2;
 static const uint8_t SCL = 3;
+#define LED_BUILTIN 13
 
 // Map SPI port to 'new' pins D14..D17
 static const uint8_t SS   = 17;

diff --git a/hardware/arduino/avr/variants/mega/pins_arduino.h b/hardware/arduino/avr/variants/mega/pins_arduino.h
@@ -39,7 +39,7 @@ static const uint8_t SCK  = 52;
 
 static const uint8_t SDA = 20;
 static const uint8_t SCL = 21;
-static const uint8_t LED_BUILTIN = 13;
+#define LED_BUILTIN 13
 
 static const uint8_t A0 = 54;
 static const uint8_t A1 = 55;

diff --git a/hardware/arduino/avr/variants/standard/pins_arduino.h b/hardware/arduino/avr/variants/standard/pins_arduino.h
@@ -44,7 +44,7 @@ static const uint8_t SCK  = 13;
 
 static const uint8_t SDA = 18;
 static const uint8_t SCL = 19;
-static const uint8_t LED_BUILTIN = 13;
+#define LED_BUILTIN 13
 
 static const uint8_t A0 = 14;
 static const uint8_t A1 = 15;