From: Miceuz 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=-c Merge branch 'master' of git://github.com/microbuilder/LPC1343CodeBase --- 9b1c307f5be2e264cf0ce6f38af872f2b149be5d diff --combined projectconfig.h index 1d3c92f,d3743ce..f9f1e3f --- a/projectconfig.h +++ b/projectconfig.h @@@ -196,12 -196,12 +196,12 @@@ LM75B 0x90 1001000x MCP24AA 0xA0 1010000x MCP4725 0xC0 1100000x *** - TEA5767 0xC0 1100000x *** + TEA5767 0xC0 1100000x *** TSL2561 0x72 0111001x TCS3414 0x72 0111001x PN532 0x48 0100100x SSD1306_I2C 0x78 0111100x // Assumes SA0 = GND - INA219 0xF0 10000000x // Assumes A0+A1 = GND + INA219 0xF0 10000000x // Assumes A0+A1 = GND [1] Alternative addresses may exists, but the addresses listed in this table are the values used in the code base @@@ -617,8 -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