diff options
| -rw-r--r-- | firmware/include_board/board.h | 6 | ||||
| -rw-r--r-- | firmware/src_simtrace/usb.c | 2 | ||||
| -rwxr-xr-x | usb_application/simtrace.py | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/firmware/include_board/board.h b/firmware/include_board/board.h index 2940dfc..37330b5 100644 --- a/firmware/include_board/board.h +++ b/firmware/include_board/board.h @@ -181,10 +181,8 @@ #define BOARD_USB_BMATTRIBUTES USBConfigurationDescriptor_BUSPOWERED_NORWAKEUP //#define BOARD_USB_BMATTRIBUTES USBConfigurationDescriptor_SELFPOWERED_RWAKEUP -#define ATMEL_VENDOR_ID 0x03EB -#define SIMTRACE_PRODUCT_ID 0x6004 -//#define OPENPCD_VENDOR_ID 0x16c0 -//#define SIMTRACE_PRODUCT_ID 0x0762 +#define SIMTRACE_VENDOR_ID 0x16c0 +#define SIMTRACE_PRODUCT_ID 0x0762 #define USB_VENDOR_ID OPENPCD_VENDOR_ID #define USB_PRODUCT_ID SIMTRACE_PRODUCT_ID diff --git a/firmware/src_simtrace/usb.c b/firmware/src_simtrace/usb.c index ce50955..f8b6186 100644 --- a/firmware/src_simtrace/usb.c +++ b/firmware/src_simtrace/usb.c @@ -564,7 +564,7 @@ const USBDeviceDescriptor deviceDescriptor = { 0xff, // CDCDeviceDescriptor_PROTOCOL, BOARD_USB_ENDPOINTS_MAXPACKETSIZE(0), - ATMEL_VENDOR_ID, + SIMTRACE_VENDOR_ID, SIMTRACE_PRODUCT_ID, 1, /* Release number */ 0, /* No string descriptor for manufacturer */ diff --git a/usb_application/simtrace.py b/usb_application/simtrace.py index 4b8f3c7..4934958 100755 --- a/usb_application/simtrace.py +++ b/usb_application/simtrace.py @@ -39,7 +39,7 @@ class find_class(object): return False def find_dev(): - dev = usb.core.find(idVendor=0x03eb, idProduct=0x6004) + dev = usb.core.find(idVendor=0x16c0, idProduct=0x0762) if dev is None: raise ValueError("Device not found") else: |