From: Miceuz <mic@hardcore.lt>
Date: Tue, 29 May 2012 21:32:39 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/microbuilder/LPC1343CodeBase
X-Git-Url: http://git.rohieb.name/hackover2013-badge-firmware.git/commitdiff_plain/9b1c307f5be2e264cf0ce6f38af872f2b149be5d?hp=d5b134a6437719d3471277c1ef1da33b5d45c612

Merge branch 'master' of git://github.com/microbuilder/LPC1343CodeBase
---

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..32d5a23
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*.o
+*.bin
+*.hex
+*.elf
+*.ld
+lpcrc
diff --git a/projectconfig.h b/projectconfig.h
index d3743ce..f9f1e3f 100644
--- a/projectconfig.h
+++ b/projectconfig.h
@@ -617,8 +617,8 @@
                               CDC (see 'puts' in systeminit.c).
 
     -----------------------------------------------------------------------*/
-    #define CFG_USB_VID                   (0x239A)
-    #define CFG_USB_PID                   (0x1002)
+    #define CFG_USB_VID                   (0x1d50)
+    #define CFG_USB_PID                   (0x600c)
 
     #ifdef CFG_BRD_LPC1343_REFDESIGN
       // #define CFG_USBHID