From 883dc28dcae2735bab68d24bae4970a08f26426f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Wed, 24 May 2017 02:02:43 +0200 Subject: [PATCH] Change VID and PID to 0x15a2 and 0x6120 respectively. --- src/blfwk/UsbHidPeripheral.h | 4 ++-- src/bm_usb/usb_descriptor.c | 4 ++-- targets/MK22F51212/src/startup/gcc/startup_MK22F51212.S | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/blfwk/UsbHidPeripheral.h b/src/blfwk/UsbHidPeripheral.h index f9d174f..4f612b0 100644 --- a/src/blfwk/UsbHidPeripheral.h +++ b/src/blfwk/UsbHidPeripheral.h @@ -50,8 +50,8 @@ public: //! @brief Constants enum _usbhid_contants { - kDefault_Vid = 0x15a2, //!< Freescale VID - kDefault_Pid = 0x0073, //!< PID for KL25Z48M + kDefault_Vid = 0x1D50, //!< UHK VID + kDefault_Pid = 0x6120, //!< UHK PID }; public: diff --git a/src/bm_usb/usb_descriptor.c b/src/bm_usb/usb_descriptor.c index a0ab88e..9613331 100644 --- a/src/bm_usb/usb_descriptor.c +++ b/src/bm_usb/usb_descriptor.c @@ -178,9 +178,9 @@ uint8_t g_device_descriptor[USB_DEVICE_DESCRIPTOR_LENGTH] = { /* Max Packet size */ USB_CONTROL_MAX_PACKET_SIZE, /* Vendor ID */ - 0xa2, 0x15, /* Vendor ID for Freescale */ + 0x50, 0x1D, /* UHK VID*/ /* Product ID */ - 0x73, 0x00, /* 0x73,0x00,ProductID for KL25Z48M */ + 0x20, 0x61, /* UHK PID */ /* BCD Device version */ 0x02, 0x00, /* Manufacturer string index */ diff --git a/targets/MK22F51212/src/startup/gcc/startup_MK22F51212.S b/targets/MK22F51212/src/startup/gcc/startup_MK22F51212.S index e845a88..df81211 100644 --- a/targets/MK22F51212/src/startup/gcc/startup_MK22F51212.S +++ b/targets/MK22F51212/src/startup/gcc/startup_MK22F51212.S @@ -305,8 +305,8 @@ __isr_vector: .byte 0x10 // [10:10] enabledPeripherals /* SGF Bit 4 corresponds to USB HID */ .byte 0xFF // [11:11] i2cSlaveAddress .short 5000 // [12:13] peripheralDetectionTimeoutMs - Timeout in milliseconds for peripheral detection before jumping to application code - .short 0xFFFF // [14:15] usbVid - .short 0xFFFF // [16:17] usbPid + .short 0x1D50 // [14:15] usbVid + .short 0x6120 // [16:17] usbPid .long 0xFFFFFFFF // [18:1b] usbStringsPointer .byte 0x00 // [1c:1c] clockFlags - High Speed and other clock options /* SGF Set to 0 to enable 48 MHz CLK and USB HID */ .byte 0xFF // [1d:1d] clockDivider - One's complement of clock divider, zero divider is divide by 1