Merge pull request #12 from stepto/master

Added support for Bare Conductive Touch Board

2 files changed, 46 insertions, 5 deletions

diff --git a/avr/boards.txt b/avr/boards.txt
index d1226cf..53720ea 100644
--- a/avr/boards.txt
+++ b/avr/boards.txt
@@ -89,3 +89,40 @@ micro.build.variant=arduino:micro
 micro.build.extra_flags={build.usb_flags}
 
 ##############################################################
+
+baretouch.name=Bare Conductive Touch Board (arcore, iPad compatible)
+baretouch.vid.0=0x2A6E
+baretouch.pid.0=0x0003
+baretouch.vid.1=0x2A6E
+baretouch.pid.1=0x8003
+baretouch.upload.tool=arduino:avrdude
+baretouch.upload.protocol=avr109
+baretouch.upload.maximum_size=28672
+baretouch.upload.maximum_data_size=2560
+baretouch.upload.speed=57600
+baretouch.upload.disable_flushing=true
+baretouch.upload.use_1200bps_touch=true
+baretouch.upload.wait_for_upload_port=true
+
+baretouch.bootloader.tool=arduino:avrdude
+baretouch.bootloader.low_fuses=0xff
+baretouch.bootloader.high_fuses=0xd8
+baretouch.bootloader.extended_fuses=0xcb
+baretouch.bootloader.file=caterina/Caterina-BareTouch.hex
+baretouch.bootloader.unlock_bits=0x3F
+baretouch.bootloader.lock_bits=0x2F
+
+baretouch.build.mcu=atmega32u4
+baretouch.build.f_cpu=16000000L
+baretouch.build.vid=0x2A6E
+baretouch.build.pid=0x8003
+baretouch.build.usb_product="Touch Board"
+baretouch.build.usb_manufacturer="Bare Conductive"
+baretouch.build.board=AVR_BARETOUCH
+baretouch.build.core=arcore
+baretouch.build.variant=arduino:leonardo
+baretouch.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DIPAD_COMPAT
+
+baretouch.variant=arduino:standard
+
+##############################################################
diff --git a/avr/cores/arcore/USBCore.cpp b/avr/cores/arcore/USBCore.cpp
index 8b95058..44969b7 100644
--- a/avr/cores/arcore/USBCore.cpp
+++ b/avr/cores/arcore/USBCore.cpp
@@ -59,19 +59,23 @@ const u16 STRING_IPRODUCT[17] = {
 	'A','r','d','u','i','n','o',' ','E','s','p','l','o','r','a',' '
 #elif USB_PID == 0x9208
 	'L','i','l','y','P','a','d','U','S','B',' ',' ',' ',' ',' ',' '
+#elif USB_PID == 0x8003
+	'T','o','u','c','h',' ','B','o','a','r','d',' ',' ',' ',' ',' '
 #else
 	'U','S','B',' ','I','O',' ','B','o','a','r','d',' ',' ',' ',' '
 #endif
 };
 
-const u16 STRING_IMANUFACTURER[12] = {
-	(3<<8) | (2+2*11),
+const u16 STRING_IMANUFACTURER[16] = {
+	(3<<8) | (2+2*15),
 #if USB_VID == 0x2341
-	'A','r','d','u','i','n','o',' ','L','L','C'
+	'A','r','d','u','i','n','o',' ','L','L','C', ' ', ' ', ' ', ' '
 #elif USB_VID == 0x1b4f
-	'S','p','a','r','k','F','u','n',' ',' ',' '
+	'S','p','a','r','k','F','u','n',' ',' ',' ', ' ', ' ', ' ', ' '
+#elif USB_VID == 0x2A6E
+	'B','a','r','e',' ','C','o','n','d','u','c', 't', 'i', 'v', 'e'
 #else
-	'U','n','k','n','o','w','n',' ',' ',' ',' '
+	'U','n','k','n','o','w','n',' ',' ',' ',' ', ' ', ' ', ' ', ' '
 #endif
 };