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

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
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 (file)
--- 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