summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsakumisu <[email protected]>2022-08-20 19:30:25 +0800
committersakumisu <[email protected]>2022-08-20 19:30:25 +0800
commitb139f8c133dce3a6e9b4a076608f5c7fd90b89c7 (patch)
treebec78a5684ba5a14ea6010e2dd2bf8c5ee7fbd92
parent3c94fca8d815ea846e14037ceeeb85320c923ab5 (diff)
add hid header and file into compiling
-rw-r--r--demo/es32/usb_device/ES32F369x/MDK-ARM/example.uvoptx12
-rw-r--r--demo/es32/usb_device/ES32F369x/MDK-ARM/example.uvprojx7
-rw-r--r--demo/hpm/usb_device/CMakeLists.txt1
-rw-r--r--demo/stm32/usb_device/stm32f103c8t6/MDK-ARM/stm32f103c8t6.uvoptx12
-rw-r--r--demo/stm32/usb_device/stm32f103c8t6/MDK-ARM/stm32f103c8t6.uvprojx5
-rw-r--r--demo/stm32/usb_device/stm32f429igt6/MDK-ARM/stm32f429igt6.uvoptx16
-rw-r--r--demo/stm32/usb_device/stm32f429igt6/MDK-ARM/stm32f429igt6.uvprojx7
7 files changed, 56 insertions, 4 deletions
diff --git a/demo/es32/usb_device/ES32F369x/MDK-ARM/example.uvoptx b/demo/es32/usb_device/ES32F369x/MDK-ARM/example.uvoptx
index 0a6ecbaf..c2df1b75 100644
--- a/demo/es32/usb_device/ES32F369x/MDK-ARM/example.uvoptx
+++ b/demo/es32/usb_device/ES32F369x/MDK-ARM/example.uvoptx
@@ -475,6 +475,18 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
+ <File>
+ <GroupNumber>4</GroupNumber>
+ <FileNumber>18</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\..\..\..\..\class\hid\usbd_hid.c</PathWithFileName>
+ <FilenameWithoutPath>usbd_hid.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
</Group>
</ProjectOpt>
diff --git a/demo/es32/usb_device/ES32F369x/MDK-ARM/example.uvprojx b/demo/es32/usb_device/ES32F369x/MDK-ARM/example.uvprojx
index 5b50f151..bd5d475a 100644
--- a/demo/es32/usb_device/ES32F369x/MDK-ARM/example.uvprojx
+++ b/demo/es32/usb_device/ES32F369x/MDK-ARM/example.uvprojx
@@ -340,7 +340,7 @@
<MiscControls></MiscControls>
<Define>ES32F36xx</Define>
<Undefine></Undefine>
- <IncludePath>..\..\..\Drivers\CMSIS\Include;..\..\..\Drivers\CMSIS\Device\EastSoft\ES32F36xx\Include;..\..\..\Drivers\ALD\ES32F36xx\Include;..\Inc;..\..\..\..\..\common;..\..\..\..\..\core;..\..\..\..\..\class\cdc;..\..\..\..\..\class\msc;..\..\..\..\..\demo</IncludePath>
+ <IncludePath>..\..\..\Drivers\CMSIS\Include;..\..\..\Drivers\CMSIS\Device\EastSoft\ES32F36xx\Include;..\..\..\Drivers\ALD\ES32F36xx\Include;..\Inc;..\..\..\..\..\common;..\..\..\..\..\core;..\..\..\..\..\class\cdc;..\..\..\..\..\class\msc;..\..\..\..\..\class\hid;..\..\..\..\..\class\audio;..\..\..\..\..\class\video;..\..\..\..\..\demo</IncludePath>
</VariousControls>
</Cads>
<Aads>
@@ -484,6 +484,11 @@
<FileType>1</FileType>
<FilePath>..\..\..\..\..\port\musb\usb_dc_musb.c</FilePath>
</File>
+ <File>
+ <FileName>usbd_hid.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\..\..\..\..\class\hid\usbd_hid.c</FilePath>
+ </File>
</Files>
</Group>
</Groups>
diff --git a/demo/hpm/usb_device/CMakeLists.txt b/demo/hpm/usb_device/CMakeLists.txt
index 8427e520..258a3f07 100644
--- a/demo/hpm/usb_device/CMakeLists.txt
+++ b/demo/hpm/usb_device/CMakeLists.txt
@@ -7,6 +7,7 @@ set(CONFIG_CHERRYUSB 1)
set(CONFIG_USB_DEVICE 1)
set(CONFIG_CHERRYUSB_DEVICE 1)
set(CONFIG_CHERRYUSB_DEVICE_CDC 1)
+set(CONFIG_CHERRYUSB_DEVICE_HID 1)
set(CONFIG_CHERRYUSB_DEVICE_MSC 1)
set(CONFIG_CHERRYUSB_DEVICE_DEMO_CDC_MSC 1)
diff --git a/demo/stm32/usb_device/stm32f103c8t6/MDK-ARM/stm32f103c8t6.uvoptx b/demo/stm32/usb_device/stm32f103c8t6/MDK-ARM/stm32f103c8t6.uvoptx
index 817180a2..406858e5 100644
--- a/demo/stm32/usb_device/stm32f103c8t6/MDK-ARM/stm32f103c8t6.uvoptx
+++ b/demo/stm32/usb_device/stm32f103c8t6/MDK-ARM/stm32f103c8t6.uvoptx
@@ -596,6 +596,18 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
+ <PathWithFileName>..\..\..\..\..\class\hid\usbd_hid.c</PathWithFileName>
+ <FilenameWithoutPath>usbd_hid.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>5</GroupNumber>
+ <FileNumber>28</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
<PathWithFileName>..\..\..\..\..\port\fsdev\usb_dc_fsdev.c</PathWithFileName>
<FilenameWithoutPath>usb_dc_fsdev.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
diff --git a/demo/stm32/usb_device/stm32f103c8t6/MDK-ARM/stm32f103c8t6.uvprojx b/demo/stm32/usb_device/stm32f103c8t6/MDK-ARM/stm32f103c8t6.uvprojx
index 185151be..2ffff9d3 100644
--- a/demo/stm32/usb_device/stm32f103c8t6/MDK-ARM/stm32f103c8t6.uvprojx
+++ b/demo/stm32/usb_device/stm32f103c8t6/MDK-ARM/stm32f103c8t6.uvprojx
@@ -535,6 +535,11 @@
<FilePath>..\..\..\..\..\class\msc\usbd_msc.c</FilePath>
</File>
<File>
+ <FileName>usbd_hid.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\..\..\..\..\class\hid\usbd_hid.c</FilePath>
+ </File>
+ <File>
<FileName>usb_dc_fsdev.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\..\port\fsdev\usb_dc_fsdev.c</FilePath>
diff --git a/demo/stm32/usb_device/stm32f429igt6/MDK-ARM/stm32f429igt6.uvoptx b/demo/stm32/usb_device/stm32f429igt6/MDK-ARM/stm32f429igt6.uvoptx
index 8b7eda1e..3b7bdaf7 100644
--- a/demo/stm32/usb_device/stm32f429igt6/MDK-ARM/stm32f429igt6.uvoptx
+++ b/demo/stm32/usb_device/stm32f429igt6/MDK-ARM/stm32f429igt6.uvoptx
@@ -521,7 +521,7 @@
<Group>
<GroupName>CherryUSB</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -556,6 +556,18 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
+ <PathWithFileName>..\..\..\..\..\class\hid\usbd_hid.c</PathWithFileName>
+ <FilenameWithoutPath>usbd_hid.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>5</GroupNumber>
+ <FileNumber>26</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
<PathWithFileName>..\..\..\..\..\core\usbd_core.c</PathWithFileName>
<FilenameWithoutPath>usbd_core.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
@@ -563,7 +575,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>26</FileNumber>
+ <FileNumber>27</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
diff --git a/demo/stm32/usb_device/stm32f429igt6/MDK-ARM/stm32f429igt6.uvprojx b/demo/stm32/usb_device/stm32f429igt6/MDK-ARM/stm32f429igt6.uvprojx
index 9d0cc3c0..e2e72950 100644
--- a/demo/stm32/usb_device/stm32f429igt6/MDK-ARM/stm32f429igt6.uvprojx
+++ b/demo/stm32/usb_device/stm32f429igt6/MDK-ARM/stm32f429igt6.uvprojx
@@ -340,7 +340,7 @@
<MiscControls></MiscControls>
<Define>USE_HAL_DRIVER,STM32F429xx,CONFIG_USB_DWC2_PORT=HS_PORT</Define>
<Undefine></Undefine>
- <IncludePath>../Core/Inc;../Drivers/STM32F4xx_HAL_Driver/Inc;../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F4xx/Include;../Drivers/CMSIS/Include;..\..\..\..\..\class\cdc;..\..\..\..\..\core;..\..\..\..\..\common;..\..\..\..\..\class\video;..\..\..\..\..\class\msc;..\..\..\..\..\class\audio</IncludePath>
+ <IncludePath>../Core/Inc;../Drivers/STM32F4xx_HAL_Driver/Inc;../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F4xx/Include;../Drivers/CMSIS/Include;..\..\..\..\..\core;..\..\..\..\..\common;..\..\..\..\..\class\cdc;..\..\..\..\..\class\msc;..\..\..\..\..\class\hid;..\..\..\..\..\class\audio;..\..\..\..\..\class\video</IncludePath>
</VariousControls>
</Cads>
<Aads>
@@ -576,6 +576,11 @@
<FilePath>..\..\..\..\..\class\msc\usbd_msc.c</FilePath>
</File>
<File>
+ <FileName>usbd_hid.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\..\..\..\..\class\hid\usbd_hid.c</FilePath>
+ </File>
+ <File>
<FileName>usbd_core.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\..\core\usbd_core.c</FilePath>