summaryrefslogtreecommitdiff
path: root/ucoo/base/test/test.stm32.cc
diff options
context:
space:
mode:
authorNicolas Schodet2016-07-25 15:18:40 +0200
committerNicolas Schodet2019-10-09 23:05:44 +0200
commit4695b47da68a5b2f75270bea21e15b8f1b9fd6ff (patch)
tree6e5ef4d34ee69bcd6c6627f25a0ca3aa902d47e3 /ucoo/base/test/test.stm32.cc
parentd7df91926bdb529e68eff9a215aef72072803b6e (diff)
Switch to CMSIS
Diffstat (limited to 'ucoo/base/test/test.stm32.cc')
-rw-r--r--ucoo/base/test/test.stm32.cc31
1 files changed, 22 insertions, 9 deletions
diff --git a/ucoo/base/test/test.stm32.cc b/ucoo/base/test/test.stm32.cc
index cb47db3..3d7a9fa 100644
--- a/ucoo/base/test/test.stm32.cc
+++ b/ucoo/base/test/test.stm32.cc
@@ -24,8 +24,9 @@
#include "test.hh"
#include "config/ucoo/base/test.hh"
-#if CONFIG_UCOO_BASE_TEST_TEST_STREAM_UART == -1
+#if CONFIG_UCOO_BASE_TEST_TEST_STREAM_USE_USB
# include "ucoo/hal/usb/usb.hh"
+# include "ucoo/hal/usb/usb_cdc.hh"
#else
# include "ucoo/hal/uart/uart.hh"
#endif
@@ -37,15 +38,27 @@ namespace ucoo {
Stream &
test_stream (void)
{
-#if CONFIG_UCOO_BASE_TEST_TEST_STREAM_UART == -1
- static UsbStreamControl usc (CONFIG_UCOO_BASE_TEST_TEST_STREAM_VENDOR,
- CONFIG_UCOO_BASE_TEST_TEST_STREAM_PRODUCT);
- static UsbStream us (usc, 0);
- usc.enable ();
- return us;
-#else
- static Uart u (CONFIG_UCOO_BASE_TEST_TEST_STREAM_UART);
static bool enabled = false;
+#if CONFIG_UCOO_BASE_TEST_TEST_STREAM_USE_USB
+ static const auto string_descs_pack = usb_descs_pack (
+ usb_string_desc (USB_LANGUAGE_EN_US),
+ usb_string_desc (CONFIG_UCOO_BASE_TEST_TEST_STREAM_USB_VENDOR),
+ usb_string_desc (CONFIG_UCOO_BASE_TEST_TEST_STREAM_USB_PRODUCT));
+ static const auto string_descs = ucoo::usb_descs (string_descs_pack);
+ static UsbDriverDwcOtg driver (
+ CONFIG_UCOO_BASE_TEST_TEST_STREAM_USB_INSTANCE,
+ usb_cdc_default_device_desc (),
+ usb_cdc_default_configuration_desc (),
+ string_descs);
+ static UsbApplicationCdcAcm cdc (driver);
+ if (!enabled)
+ {
+ enabled = true;
+ driver.enable ();
+ }
+ return cdc;
+#else
+ static Uart u (CONFIG_UCOO_BASE_TEST_TEST_STREAM_UART_INSTANCE);
if (!enabled)
{
enabled = true;