Skip to content

libraries: guard TinyUSB include under PlatformIO so SAMD builds compile #396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tyeth-ai-assisted wants to merge 4 commits into
base: master
Choose a base branch
from
Open

libraries: guard TinyUSB include under PlatformIO so SAMD builds compile #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c63ec86
libraries: guard TinyUSB include for PlatformIO only
tyeth Aug 28, 2026
2b9f06b
Update platform version to 1.7.18
tyeth Sep 16, 2026
73b156a
libraries: simplify TinyUSB guard to a single flat condition
tyeth Sep 18, 2026
c52580f
libraries: drop the TinyUSB include under PlatformIO instead of probi…
tyeth Sep 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion libraries/I2S/src/I2S.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,13 @@ static I2SDevice_SAMD21G18x i2sd(*I2S);
#include "I2S.h"

#ifdef USE_TINYUSB
// For Serial when selecting TinyUSB
// For Serial when selecting TinyUSB; the Arduino builder discovers and links
// the library from this include. PlatformIO never resolves it (framework-
// bundled libraries get no lib_deps include paths), so skip it there.
#ifndef PLATFORMIO
#include <Adafruit_TinyUSB.h>
#endif
#endif


int I2SClass::_beginCount = 0;
Expand Down
6 changes: 5 additions & 1 deletion libraries/SAMD_AnalogCorrection/src/SAMD_AnalogCorrection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,13 @@
#include "SAMD_AnalogCorrection.h"

#ifdef USE_TINYUSB
// For Serial when selecting TinyUSB
// For Serial when selecting TinyUSB; the Arduino builder discovers and links
// the library from this include. PlatformIO never resolves it (framework-
// bundled libraries get no lib_deps include paths), so skip it there.
#ifndef PLATFORMIO
#include <Adafruit_TinyUSB.h>
#endif
#endif

void analogReadCorrection (int offset, uint16_t gain)
{
Expand Down
6 changes: 5 additions & 1 deletion libraries/SPI/SPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,13 @@
#include <assert.h>

#ifdef USE_TINYUSB
// For Serial when selecting TinyUSB
// For Serial when selecting TinyUSB; the Arduino builder discovers and links
// the library from this include. PlatformIO never resolves it (framework-
// bundled libraries get no lib_deps include paths), so skip it there.
#ifndef PLATFORMIO
#include <Adafruit_TinyUSB.h>
#endif
#endif

#define SPI_IMODE_NONE 0
#define SPI_IMODE_EXTINT 1
Expand Down
6 changes: 5 additions & 1 deletion libraries/Servo/src/samd/Servo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,13 @@
#include <Servo.h>

#ifdef USE_TINYUSB
// For Serial when selecting TinyUSB
// For Serial when selecting TinyUSB; the Arduino builder discovers and links
// the library from this include. PlatformIO never resolves it (framework-
// bundled libraries get no lib_deps include paths), so skip it there.
#ifndef PLATFORMIO
#include <Adafruit_TinyUSB.h>
#endif
#endif

#if defined(__SAMD51__)
// Different prescalers depending on FCPU (avoid overflowing 16-bit counter)
Expand Down
6 changes: 5 additions & 1 deletion libraries/Wire/Wire.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,13 @@ extern "C" {
#include <wiring_private.h>

#ifdef USE_TINYUSB
// For Serial when selecting TinyUSB
// For Serial when selecting TinyUSB; the Arduino builder discovers and links
// the library from this include. PlatformIO never resolves it (framework-
// bundled libraries get no lib_deps include paths), so skip it there.
#ifndef PLATFORMIO
#include <Adafruit_TinyUSB.h>
#endif
#endif

#include "Wire.h"

Expand Down
2 changes: 1 addition & 1 deletion platform.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# https://arduino.github.io/arduino-cli/0.33/platform-specification/

name=Adafruit SAMD (32-bits ARM Cortex-M0+ and Cortex-M4) Boards
version=1.7.17
version=1.7.18

# Compile variables
# -----------------
Expand Down
Loading