Merge branch 'master' into core-ble

Author: oclyke

cores/arduino/ard_sup/Arduino_defines.h

@@ -48,3 +48,5 @@
 #define bit(b) (1UL << (b))
 
 #define digitalPinToInterrupt(P) (P) // all apollo3 pads are interrupt capable
+
+#define SS 255 //Built in SD library requires an SS pin be defined. Pin # is arbitrary.

libraries/RTC/keywords.txt

@@ -16,6 +16,17 @@ getTime	KEYWORD2
 setTime	KEYWORD2
 setTimeToCompiler	KEYWORD2
 
+hour	KEYWORD2
+minute	KEYWORD2
+seconds	KEYWORD2
+hundredths	KEYWORD2
+
+month	KEYWORD2
+dayOfMonth	KEYWORD2
+year	KEYWORD2
+weekday	KEYWORD2
+textWeekday	KEYWORD2
+
 #######################################
 # Constants (LITERAL1)
 #######################################

tools/artemis/windows/artemis_svl.exe

@@ -62,16 +62,16 @@ extern Uart Serial1;
 // SPI Pins
 #define MOSI 11
 #define MISO 12
-#define SCK  13
+#define SCK 13
 // Wire Pins
-#define SCL  15
-#define SDA  14
+#define SCL 15
+#define SDA 14
 // Wire1 Pins
 #define SCL1 17
 #define SDA1 16
 // Serial1 Pins
-#define TX1  1
-#define RX1  0
+#define TX1 1
+#define RX1 0
 // PDM Microphone Pins
 #define MIC_DATA 27
 #define MIC_CLOCK 28