Commits

iorodeo committed 12a3a78 Merge

Merged remote heads.

  • Participants
  • Parent commits 9ce4276, e3c3a9b

Comments (0)

Files changed (2)

firmware/io_pins.cpp

 #include "io_pins.h"
+#if defined(ARDUINO) && ARDUINO >= 100
+#include "Arduino.h"
+#else
+#include "WProgram.h"
+#endif
 
-// ----------------------------------------------------------------------------
+#ifndef BLE_SHIELD
+
 // IO Pins for UNO Shield 
-// ----------------------------------------------------------------------------
+// --------------------------------------------------------
 
 // RGB LED Control Pins
 const int LED_BLU_PIN = 9; 
 const int COLOR_SENSOR_S3 = 7; 
 const int COLOR_SENSOR_FO = 8;       
 
-//// ----------------------------------------------------------------------------
-//// IO Pins for Nano on Sensor expansion board
-//// ----------------------------------------------------------------------------
-//
-//// RGB LED Control Pins
-//const int LED_BLU_PIN = A1; 
-//const int LED_GRN_PIN = A2; 
-//const int LED_RED_PIN = A3;
-//
-//// Color Sensor Control Pins
-//const int COLOR_SENSOR_S0 = A0; 
-//const int COLOR_SENSOR_S1 = 5; 
-//const int COLOR_SENSOR_S2 = 3; 
-//const int COLOR_SENSOR_S3 = 4; 
-//const int COLOR_SENSOR_FO = 2;       
+#else
+
+// IO Pins for BLE shield
+// --------------------------------------------------------
+
+// RGB LED Control Pins
+const int LED_BLU_PIN = 3; 
+const int LED_GRN_PIN = A1; 
+const int LED_RED_PIN = A0;
+
+// Color Sensor Control Pins
+const int COLOR_SENSOR_S0 = 4; 
+const int COLOR_SENSOR_S1 = 5; 
+const int COLOR_SENSOR_S2 = 6; 
+const int COLOR_SENSOR_S3 = 7; 
+const int COLOR_SENSOR_FO = 2;       
+
+#endif
+

firmware/io_pins.h

 #ifndef _IO_PINS_H_
 #define _IO_PINS_H_
 
+//#define BLE_SHIELD
+
 // RGB LED Control Pins
 extern const int LED_BLU_PIN; 
 extern const int LED_GRN_PIN;