update CMSIS_DAP and HID keyboard

DeqingSun · DeqingSun · commit 32228b9c4fc5 · 2020-12-02T21:56:29.000-05:00
Change HID PID. Remove the change for the 1st byte response in CMSIS-DAP.
diff --git a/ch55xduino/ch55x/libraries/Generic_Examples/examples/05.USB/CMSIS_DAP/CMSIS_DAP.ino b/ch55xduino/ch55x/libraries/Generic_Examples/examples/05.USB/CMSIS_DAP/CMSIS_DAP.ino
@@ -14,6 +14,9 @@
 
 */
 
+//For windows user, if you ever played with other HID device with the same PID C55D
+//You may need to uninstall the previous driver completely        
+
 
 #ifndef USER_USB_RAM
 #error "This example needs to be compiled with a USER USB setting"
@@ -30,9 +33,10 @@ void setup() {
 }
 
 void loop() {
+  uint8_t dapSendLength = 0;
   if (USBByteCountEP1) {
-    DAP_Thread();
-    USBByteCountEP1 = 0 ;
+    dapSendLength = DAP_Thread();
+    USBByteCountEP1 = 0;
 
     UEP1_CTRL = UEP1_CTRL & ~ MASK_UEP_R_RES | UEP_R_RES_ACK; //enable receive
 
diff --git a/ch55xduino/ch55x/libraries/Generic_Examples/examples/05.USB/CMSIS_DAP/src/CMSIS_DAPusb/DAP.c b/ch55xduino/ch55x/libraries/Generic_Examples/examples/05.USB/CMSIS_DAP/src/CMSIS_DAPusb/DAP.c
@@ -988,9 +988,10 @@ static uint8_t DAP_WriteAbort(const uint8_t *req, uint8_t *res)
 }
 
 // DAP Thread.
-void DAP_Thread(void)
+uint8_t DAP_Thread(void)
 {
     uint8_t num;
+    uint8_t returnVal = 0;
 
     if (1)
     {
@@ -1070,6 +1071,8 @@ void DAP_Thread(void)
             break;
         }
 
-        Ep1Buffer[64] = num + 1;
+        returnVal = num + 1;
     }
+    
+    return returnVal;
 }
diff --git a/ch55xduino/ch55x/libraries/Generic_Examples/examples/05.USB/CMSIS_DAP/src/CMSIS_DAPusb/DAP.h b/ch55xduino/ch55x/libraries/Generic_Examples/examples/05.USB/CMSIS_DAP/src/CMSIS_DAPusb/DAP.h
@@ -213,7 +213,7 @@ extern __idata uint8_t turnaround;
 extern __idata uint8_t data_phase;
 extern __idata uint8_t idle_cycles;
 
-extern void DAP_Thread(void);
+extern uint8_t DAP_Thread(void);
 extern void PORT_SWD_SETUP(void);
 extern uint8_t SWD_Transfer(uint8_t reqI, uint8_t __xdata *datas);
 extern void SWJ_Sequence(uint8_t count, const uint8_t *datas);
diff --git a/ch55xduino/ch55x/libraries/Generic_Examples/examples/05.USB/CMSIS_DAP/src/CMSIS_DAPusb/USBconstant.c b/ch55xduino/ch55x/libraries/Generic_Examples/examples/05.USB/CMSIS_DAP/src/CMSIS_DAPusb/USBconstant.c
@@ -7,7 +7,7 @@ __code uint8_t DevDesc[] = {
     0x10,0x01,  //USB spec release number in BCD format, USB1.1 (0x10, 0x01).
     0x00,0x00,0x00, //bDeviceClass, bDeviceSubClass, bDeviceProtocol
     DEFAULT_ENDP0_SIZE, //PACKET_SIZE
-    0x09,0x12,0x50,0xC5, // VID PID
+    0x09,0x12,0x5D,0xC5, // VID PID
     0x00,0x01,  //version
     0x01,0x02,0x03, //bString
     0x01    //bNumConfigurations
diff --git a/ch55xduino/ch55x/libraries/Generic_Examples/examples/05.USB/HidKeyboard/HidKeyboard.ino b/ch55xduino/ch55x/libraries/Generic_Examples/examples/05.USB/HidKeyboard/HidKeyboard.ino
@@ -9,6 +9,9 @@
 
 */
 
+//For windows user, if you ever played with other HID device with the same PID C55D
+//You may need to uninstall the previous driver completely        
+
 
 #ifndef USER_USB_RAM
 #error "This example needs to be compiled with a USER USB setting"
diff --git a/ch55xduino/ch55x/libraries/Generic_Examples/examples/05.USB/HidKeyboard/src/userUsbHidKeyboard/USBconstant.c b/ch55xduino/ch55x/libraries/Generic_Examples/examples/05.USB/HidKeyboard/src/userUsbHidKeyboard/USBconstant.c
@@ -7,7 +7,7 @@ __code uint8_t DevDesc[] = {
     0x10,0x01,  //USB spec release number in BCD format, USB1.1 (0x10, 0x01).
     0x00,0x00,0x00, //bDeviceClass, bDeviceSubClass, bDeviceProtocol 
     DEFAULT_ENDP0_SIZE, //bNumConfigurations
-    0x09,0x12,0x50,0xC5, // VID PID 
+    0x09,0x12,0x5D,0xC5, // VID PID 
     0x00,0x01,  //version
     0x01,0x02,0x03, //bString
     0x01    //bNumConfigurations

Original file line number	Diff line number	Diff line change
`@@ -988,9 +988,10 @@ static uint8_t DAP_WriteAbort(const uint8_t req, uint8_t res)`
`988`	`988`	`}`
`989`	`989`
`990`	`990`	`// DAP Thread.`
`991`		`-void DAP_Thread(void)`
	`991`	`+uint8_t DAP_Thread(void)`
`992`	`992`	`{`
`993`	`993`	`uint8_t num;`
	`994`	`+ uint8_t returnVal = 0;`
`994`	`995`
`995`	`996`	`if (1)`
`996`	`997`	`{`
`@@ -1070,6 +1071,8 @@ void DAP_Thread(void)`
`1070`	`1071`	`break;`
`1071`	`1072`	`}`
`1072`	`1073`
`1073`		`- Ep1Buffer[64] = num + 1;`
	`1074`	`+ returnVal = num + 1;`
`1074`	`1075`	`}`
	`1076`	`+`
	`1077`	`+ return returnVal;`
`1075`	`1078`	`}`