Skip to content

Commit

Permalink
Merge pull request #71 from rgrr/feature/60-build-failure
Browse files Browse the repository at this point in the history
Should now really build with TinyUSB 0.15.0
  • Loading branch information
rgrr authored Aug 1, 2023
2 parents 0b10179 + f8e1d90 commit c1cf0cf
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
4 changes: 4 additions & 0 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,10 @@ the actual build process.
To build the project, there must be somewhere a recent https://github.com/raspberrypi/pico-sdk[Pico SDK] and
the environment variable `PICO_SDK_PATH` must point to it.

NOTE: I'm most of the time on the master branch of TinyUSB which is part of the Pico SDK. Originally
TinyUSB 0.15.0 is being used by Pico SDK 1.5.1. +
So if you experience unexpected behaviour, I recommend to update TineUSB and retry.

If you want to adopt YAPicoprobe options to your needs, check CMakeLists.txt and invoke cmake accordingly.

Requirements:
Expand Down
3 changes: 2 additions & 1 deletion src/net/tinyusb/ncm_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@

#if ECLIPSE_GUI || ( CFG_TUD_ENABLED && CFG_TUD_NCM )

#if ECLIPSE_GUI
#if !defined(tu_static) || ECLIPSE_GUI
// TinyUSB <=0.15.0 does not know "tu_static"
#define tu_static static
#endif

Expand Down
3 changes: 2 additions & 1 deletion src/net/tinyusb/ncm_device_simple.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@

#if ECLIPSE_GUI || ( CFG_TUD_ENABLED && CFG_TUD_NCM )

#if ECLIPSE_GUI
#if !defined(tu_static) || ECLIPSE_GUI
// TinyUSB <=0.15.0 does not know "tu_static"
#define tu_static static
#endif

Expand Down

0 comments on commit c1cf0cf

Please sign in to comment.