Merge remote-tracking branch 'remotes/origin/master'

Author: mattairtech

bootloaders/zero/Makefile

@@ -154,7 +154,7 @@ BIN=$(NAME).bin
 HEX=$(NAME).hex
 
 
-INCLUDES=-I"$(MODULE_PATH_ARDUINO)/tools/CMSIS/4.5.0/CMSIS/Include/" -I"$(MODULE_PATH)/tools/CMSIS-Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/"
+INCLUDES=-I"$(MODULE_PATH_ARDUINO)/tools/CMSIS/4.5.0/CMSIS/Include/" -I"$(MODULE_PATH)/tools/CMSIS-Atmel/1.0.0-mattairtech-2/CMSIS/Device/ATMEL/"
 
 # -----------------------------------------------------------------------------
 # Linker options

libraries/HID/HID.h

@@ -23,7 +23,7 @@
 #include <Arduino.h>
 #include "USB/PluggableUSB.h"
 
-#if !defined(CDC_HID) || !defined(HID_ONLY) || !defined(WITH_CDC)
+#if !defined(CDC_HID) && !defined(HID_ONLY) && !defined(WITH_CDC)
 #error Please select CDC_HID, HID_ONLY, or WITH_CDC in the Tools->USB menu.
 #endif