Skip to content

Commit b3f550c

Browse files
sakumisuRbb666
sakumisu
authored and
Rbb666
committed
update(cherryusb): update to v1.5.3.99
Signed-off-by: sakumisu <1203593632@qq.com>
1 parent 38d070c commit b3f550c

2 files changed

Lines changed: 56 additions & 23 deletions

File tree

‎system/CherryUSB/Kconfig‎

Lines changed: 51 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if PKG_USING_CHERRYUSB
1111
default n
1212

1313
if PKG_CHERRYUSB_DEVICE
14-
choice
14+
choice CHERRYUSB_DEVICE_SPEED
1515
prompt "Select usb device speed"
1616
default PKG_CHERRYUSB_DEVICE_SPEED_FS
1717
config PKG_CHERRYUSB_DEVICE_SPEED_FS
@@ -22,7 +22,7 @@ if PKG_USING_CHERRYUSB
2222
bool "AUTO"
2323
endchoice
2424

25-
choice
25+
choice CHERRYUSB_DEVICE_IP
2626
prompt "Select usb device ip, and some ip need config in usb_config.h, please check"
2727
default PKG_CHERRYUSB_DEVICE_CUSTOM
2828
config PKG_CHERRYUSB_DEVICE_CUSTOM
@@ -37,6 +37,8 @@ if PKG_USING_CHERRYUSB
3737
bool "dwc2_esp"
3838
config PKG_CHERRYUSB_DEVICE_DWC2_KENDRYTE
3939
bool "dwc2_kendryte"
40+
config PKG_CHERRYUSB_DEVICE_DWC2_INFINEON
41+
bool "dwc2_infineon"
4042
config PKG_CHERRYUSB_DEVICE_DWC2_AT
4143
bool "dwc2_at"
4244
config PKG_CHERRYUSB_DEVICE_DWC2_HC
@@ -164,7 +166,7 @@ if PKG_USING_CHERRYUSB
164166
prompt "Enable usb cdc ecm device with lwip for lan"
165167
default n
166168

167-
choice
169+
choice CHERRYUSB_DEVICE_TEMPLATE
168170
prompt "Select usb device template, please select class driver first"
169171
default PKG_CHERRYUSB_DEVICE_TEMPLATE_NONE
170172
config PKG_CHERRYUSB_DEVICE_TEMPLATE_NONE
@@ -229,13 +231,16 @@ if PKG_USING_CHERRYUSB
229231
config PKG_CHERRYUSB_DEVICE_TEMPLATE_WINUSBV1
230232
bool
231233
prompt "winusbv1"
234+
config PKG_CHERRYUSB_DEVICE_TEMPLATE_WINUSBV2
235+
bool
236+
prompt "winusbv2"
232237
config PKG_CHERRYUSB_DEVICE_TEMPLATE_WINUSBV2_CDC
233238
bool
234239
prompt "winusbv2_cdc"
235240
depends on PKG_CHERRYUSB_DEVICE_CDC_ACM
236-
config PKG_CHERRYUSB_DEVICE_TEMPLATE_WINUSBV2_HID
241+
config PKG_CHERRYUSB_DEVICE_TEMPLATE_WEBUSB_HID
237242
bool
238-
prompt "winusbv2_hid"
243+
prompt "webusb_hid"
239244
depends on PKG_CHERRYUSB_DEVICE_HID
240245
config PKG_CHERRYUSB_DEVICE_TEMPLATE_ADB
241246
bool
@@ -259,7 +264,7 @@ if PKG_USING_CHERRYUSB
259264
default n
260265

261266
if PKG_CHERRYUSB_HOST
262-
choice
267+
choice CHERRYUSB_HOST_IP
263268
prompt "Select usb host ip, and some ip need config in usb_config.h, please check"
264269
default PKG_CHERRYUSB_HOST_CUSTOM
265270
config PKG_CHERRYUSB_HOST_CUSTOM
@@ -284,6 +289,10 @@ if PKG_USING_CHERRYUSB
284289
bool "dwc2_esp"
285290
config PKG_CHERRYUSB_HOST_DWC2_KENDRYTE
286291
bool "dwc2_kendryte"
292+
config PKG_CHERRYUSB_HOST_DWC2_INFINEON
293+
bool "dwc2_infineon"
294+
config PKG_CHERRYUSB_HOST_DWC2_AT
295+
bool "dwc2_at, f405 only"
287296
config PKG_CHERRYUSB_HOST_DWC2_HC
288297
bool "dwc2_hc"
289298
config PKG_CHERRYUSB_HOST_DWC2_NATION
@@ -311,6 +320,7 @@ if PKG_USING_CHERRYUSB
311320
config PKG_CHERRYUSB_HOST_CDC_ACM
312321
bool
313322
prompt "Enable usb cdc acm driver"
323+
select CONFIG_USBHOST_SERIAL
314324
default n
315325

316326
config PKG_CHERRYUSB_HOST_HID
@@ -378,23 +388,36 @@ if PKG_USING_CHERRYUSB
378388
config PKG_CHERRYUSB_HOST_FTDI
379389
bool
380390
prompt "Enable usb ftdi driver"
391+
select CONFIG_USBHOST_SERIAL
381392
default n
382393

383394
config PKG_CHERRYUSB_HOST_CH34X
384395
bool
385396
prompt "Enable usb ch34x driver"
397+
select CONFIG_USBHOST_SERIAL
386398
default n
387399

388400
config PKG_CHERRYUSB_HOST_CP210X
389401
bool
390402
prompt "Enable usb cp210x driver"
403+
select CONFIG_USBHOST_SERIAL
391404
default n
392405

393406
config PKG_CHERRYUSB_HOST_PL2303
394407
bool
395408
prompt "Enable usb pl2303 driver"
409+
select CONFIG_USBHOST_SERIAL
410+
default n
411+
412+
config PKG_CHERRYUSB_HOST_GSM
413+
bool
414+
prompt "Enable usb gsm driver for 4g module"
415+
select CONFIG_USBHOST_SERIAL
396416
default n
397417

418+
config CONFIG_USBHOST_SERIAL
419+
bool
420+
398421
config CONFIG_USBHOST_PLATFORM_CDC_ECM
399422
bool
400423

@@ -430,6 +453,11 @@ if PKG_USING_CHERRYUSB
430453
prompt "Set host control transfer timeout, unit is ms"
431454
default 500
432455

456+
config CONFIG_USBHOST_SERIAL_RX_SIZE
457+
int
458+
prompt "Set host serial rx max buffer size"
459+
default 2048
460+
433461
config RT_LWIP_PBUF_POOL_BUFSIZE
434462
int "The size of each pbuf in the pbuf pool"
435463
range 1500 2000
@@ -441,21 +469,26 @@ if PKG_USING_CHERRYUSB
441469
default "/"
442470

443471
menu "Select USB host template, please select class driver first"
444-
config CONFIG_TEST_USBH_CDC_ACM
445-
int
446-
prompt "demo for test cdc acm, cannot enable this demo, we have used serial framework instead"
447-
default 0
448-
depends on PKG_CHERRYUSB_HOST_CDC_ACM
472+
config CONFIG_TEST_USBH_SERIAL
473+
bool
474+
prompt "demo for test seial, cannot enable this demo, you can use rt-thread device api to test"
475+
default n
476+
depends on CONFIG_USBHOST_SERIAL
449477
config CONFIG_TEST_USBH_HID
450478
int
451479
prompt "demo for test hid"
452480
default 0
453481
depends on PKG_CHERRYUSB_HOST_HID
454482
config CONFIG_TEST_USBH_MSC
455-
int
456-
prompt "demo for test msc, cannot enable this demo, we have used dfs instead"
457-
default 0
483+
bool
484+
prompt "demo for test msc, cannot enable this demo, you can use rt-thread dfs api to test"
485+
default n
458486
depends on PKG_CHERRYUSB_HOST_MSC
487+
config CONFIG_TEST_USBH_NET
488+
bool
489+
prompt "demo for test net, cannot enable this demo, you can use lwip api to test"
490+
default n
491+
depends on PKG_CHERRYUSB_HOST_CDC_ECM || PKG_CHERRYUSB_HOST_CDC_RNDIS || PKG_CHERRYUSB_HOST_CDC_NCM || PKG_CHERRYUSB_HOST_ASIX || PKG_CHERRYUSB_HOST_RTL8152
459492
endmenu
460493
endif
461494

@@ -465,16 +498,16 @@ if PKG_USING_CHERRYUSB
465498

466499
choice
467500
prompt "Version"
468-
default PKG_USING_CHERRYUSB_V010502
501+
default PKG_USING_CHERRYUSB_V010503
469502
help
470503
Select the package version
471504

472505
config PKG_USING_CHERRYUSB_LATEST_VERSION
473506
bool "latest"
507+
config PKG_USING_CHERRYUSB_V010503
508+
bool "v1.5.3.99"
474509
config PKG_USING_CHERRYUSB_V010502
475510
bool "v1.5.2"
476-
config PKG_USING_CHERRYUSB_V010501
477-
bool "v1.5.1"
478511
config PKG_USING_CHERRYUSB_V010500
479512
bool "v1.5.0"
480513
config PKG_USING_CHERRYUSB_V010403
@@ -490,8 +523,8 @@ if PKG_USING_CHERRYUSB
490523
config PKG_CHERRYUSB_VER
491524
string
492525
default "latest" if PKG_USING_CHERRYUSB_LATEST_VERSION
526+
default "v1.5.3.99" if PKG_USING_CHERRYUSB_V010503
493527
default "v1.5.2" if PKG_USING_CHERRYUSB_V010502
494-
default "v1.5.1" if PKG_USING_CHERRYUSB_V010501
495528
default "v1.5.0" if PKG_USING_CHERRYUSB_V010500
496529
default "v1.4.3" if PKG_USING_CHERRYUSB_V010403
497530
default "v1.3.1" if PKG_USING_CHERRYUSB_V010301

‎system/CherryUSB/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@
2525
"filename": "Null for git package",
2626
"VER_SHA": "master"
2727
},
28+
{
29+
"version": "v1.5.3.99",
30+
"URL": "https://github.com/cherry-embedded/CherryUSB/archive/refs/tags/v1.5.3.99.zip",
31+
"filename": "CherryUSB-1.5.3.99.zip"
32+
},
2833
{
2934
"version": "v1.5.2",
3035
"URL": "https://github.com/cherry-embedded/CherryUSB/archive/refs/tags/v1.5.2.zip",
3136
"filename": "CherryUSB-1.5.2.zip"
3237
},
33-
{
34-
"version": "v1.5.1",
35-
"URL": "https://github.com/cherry-embedded/CherryUSB/archive/refs/tags/v1.5.1.zip",
36-
"filename": "CherryUSB-1.5.1.zip"
37-
},
3838
{
3939
"version": "v1.5.0",
4040
"URL": "https://github.com/cherry-embedded/CherryUSB/archive/refs/tags/v1.5.0.zip",

0 commit comments

Comments
 (0)