Merge pull request #18 from dmadison/upstream-1.8.6

Merge upstream tag '1.8.6'

Author: dmadison

bootloaders/caterina-Arduino_Robot/Makefile

@@ -191,7 +191,7 @@ DEBUG = dwarf-2
 
 
 # List any extra directories to look for include files here.
-# Each directory must be seperated by a space.
+# Each directory must be separated by a space.
 # Use forward slashes for directory separators.
 # For a directory that has spaces, enclose it in quotes.
 EXTRAINCDIRS = $(LUFA_PATH)/
@@ -331,7 +331,7 @@ MATH_LIB = -lm
 
 
 # List any extra directories to look for libraries here.
-# Each directory must be seperated by a space.
+# Each directory must be separated by a space.
 # Use forward slashes for directory separators.
 # For a directory that has spaces, enclose it in quotes.
 EXTRALIBDIRS =

bootloaders/caterina-LilyPadUSB/Makefile

@@ -180,7 +180,7 @@ DEBUG = dwarf-2
 
 
 # List any extra directories to look for include files here.
-# Each directory must be seperated by a space.
+# Each directory must be separated by a space.
 # Use forward slashes for directory separators.
 # For a directory that has spaces, enclose it in quotes.
 EXTRAINCDIRS = $(LUFA_PATH)/
@@ -320,7 +320,7 @@ MATH_LIB = -lm
 
 
 # List any extra directories to look for libraries here.
-# Each directory must be seperated by a space.
+# Each directory must be separated by a space.
 # Use forward slashes for directory separators.
 # For a directory that has spaces, enclose it in quotes.
 EXTRALIBDIRS =

bootloaders/caterina/Makefile

@@ -187,7 +187,7 @@ DEBUG = dwarf-2
 
 
 # List any extra directories to look for include files here.
-# Each directory must be seperated by a space.
+# Each directory must be separated by a space.
 # Use forward slashes for directory separators.
 # For a directory that has spaces, enclose it in quotes.
 EXTRAINCDIRS = $(LUFA_PATH)/
@@ -327,7 +327,7 @@ MATH_LIB = -lm
 
 
 # List any extra directories to look for libraries here.
-# Each directory must be seperated by a space.
+# Each directory must be separated by a space.
 # Use forward slashes for directory separators.
 # For a directory that has spaces, enclose it in quotes.
 EXTRALIBDIRS =

drivers/arduino.cat

@@ -55,6 +55,7 @@ robotMotor.sketch.name="Arduino Robot"
 uno.name="Arduino Uno"
 unoR3.name="Arduino Uno"
 unomini.name="Arduino Uno Mini"
+makeyourunokit.name="Arduino Make Your Uno Kit"
 usbserial.name="Arduino USB Serial Light Adapter"
 yun.bootloader.name="Arduino Yun bootloader"
 yun.sketch.name="Arduino Yun"
@@ -108,6 +109,7 @@ DefaultDestDir=12
 %uno.name%=DriverInstall, USB\VID_2341&PID_0001
 %unoR3.name%=DriverInstall, USB\VID_2341&PID_0043
 %unomini.name%=DriverInstall, USB\VID_2341&PID_0062
+%makeyourunokit.name%=DriverInstall, USB\VID_2341&PID_006A
 %usbserial.name%=DriverInstall, USB\VID_2341&PID_003B
 %yun.bootloader.name%=DriverInstall, USB\VID_2341&PID_0041
 %yun.sketch.name%=DriverInstall, USB\VID_2341&PID_8041&MI_00
@@ -138,6 +140,7 @@ DefaultDestDir=12
 %uno.name%=DriverInstall, USB\VID_2341&PID_0001
 %unoR3.name%=DriverInstall, USB\VID_2341&PID_0043
 %unomini.name%=DriverInstall, USB\VID_2341&PID_0062
+%makeyourunokit.name%=DriverInstall, USB\VID_2341&PID_006A
 %usbserial.name%=DriverInstall, USB\VID_2341&PID_003B
 %robotControl.bootloader.name%=DriverInstall, USB\VID_2341&PID_0038
 %robotControl.sketch.name%=DriverInstall, USB\VID_2341&PID_8038&MI_00
@@ -172,6 +175,7 @@ DefaultDestDir=12
 %uno.name%=DriverInstall, USB\VID_2341&PID_0001
 %unoR3.name%=DriverInstall, USB\VID_2341&PID_0043
 %unomini.name%=DriverInstall, USB\VID_2341&PID_0062
+%makeyourunokit.name%=DriverInstall, USB\VID_2341&PID_006A
 %usbserial.name%=DriverInstall, USB\VID_2341&PID_003B
 %robotControl.bootloader.name%=DriverInstall, USB\VID_2341&PID_0038
 %robotControl.sketch.name%=DriverInstall, USB\VID_2341&PID_8038&MI_00

drivers/arduino.inf

@@ -1,5 +1,5 @@
 #######################################
-# Syntax Coloring Map SPI
+# Syntax Coloring Map For SPI
 #######################################
 
 #######################################

libraries/SPI/keywords.txt

@@ -6,6 +6,8 @@
 # Datatypes (KEYWORD1)
 #######################################
 
+Wire	KEYWORD1
+
 #######################################
 # Methods and Functions (KEYWORD2)
 #######################################
@@ -18,12 +20,6 @@ requestFrom	KEYWORD2
 onReceive	KEYWORD2
 onRequest	KEYWORD2
 
-#######################################
-# Instances (KEYWORD2)
-#######################################
-
-Wire	KEYWORD2
-
 #######################################
 # Constants (LITERAL1)
 #######################################

libraries/Wire/keywords.txt

@@ -10,11 +10,11 @@ if "%PROCESSOR_ARCHITECTURE%" == "AMD64" (
 
 REM dpinst /PATH has problems with relative paths, so use absolute path.
 if "%PROCESSOR_ARCHITECTURE%" == "AMD64" (
- drivers\dpinst-amd64.exe /PATH %cd%\drivers\gemma %ARGS%
+ drivers\dpinst-amd64.exe /PATH "%cd%\drivers\gemma" %ARGS%
 ) ELSE IF "%PROCESSOR_ARCHITEW6432%" == "AMD64" (
- drivers\dpinst-amd64.exe /PATH %cd%\drivers\gemma %ARGS%
+ drivers\dpinst-amd64.exe /PATH "%cd%\drivers\gemma" %ARGS%
 ) ELSE (
- drivers\dpinst-x86.exe /PATH %cd%\drivers\gemma %ARGS%
+ drivers\dpinst-x86.exe /PATH "%cd%\drivers\gemma" %ARGS%
 )
 
 exit /b 0