add include Adafruit_TinyUSB.h to example sketches for Serial

hathach · hathach · commit 839336a1a287 · 2021-05-07T12:32:26.000+07:00
also include Adafruit_TinyUSB.h in often used libraries
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,4 @@
 # Ignore local overrides of platform.txt and boards.txt,
 /boards.local.txt
 /platform.local.txt
+/libraries/**/build/
diff --git a/libraries/Adafruit_nRFCrypto b/libraries/Adafruit_nRFCrypto
@@ -1 +1 @@
-Subproject commit 50131a583432e95295bbf9a63d2736709e9ad3ee
+Subproject commit 01de30c89bc2da783c77fda2a53f650e40fe541e
diff --git a/libraries/Bluefruit52Lib/examples/Hardware/Fading/Fading.ino b/libraries/Bluefruit52Lib/examples/Hardware/Fading/Fading.ino
@@ -17,6 +17,8 @@
 
  */
 
+#include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 
 int ledPin = LED_RED;    // LED connected to digital pin 9
 
diff --git a/libraries/Bluefruit52Lib/examples/Hardware/Serial1_test/Serial1_test.ino b/libraries/Bluefruit52Lib/examples/Hardware/Serial1_test/Serial1_test.ino
@@ -18,7 +18,8 @@
  * Note: Bluefruit nRF52832 does not support Serial1
  */
 
-#include "Arduino.h"
+#include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 
 void setup()
 {
diff --git a/libraries/Bluefruit52Lib/examples/Hardware/SerialEcho/SerialEcho.ino b/libraries/Bluefruit52Lib/examples/Hardware/SerialEcho/SerialEcho.ino
@@ -13,6 +13,7 @@
 *********************************************************************/
 
 #include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 
 const int baudrate = 115200;
 
diff --git a/libraries/Bluefruit52Lib/examples/Hardware/adc/adc.ino b/libraries/Bluefruit52Lib/examples/Hardware/adc/adc.ino
@@ -1,3 +1,6 @@
+#include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
+
 int adcin    = A5;
 int adcvalue = 0;
 float mv_per_lsb = 3600.0F/1024.0F; // 10-bit ADC with 3.6V input range
diff --git a/libraries/Bluefruit52Lib/examples/Hardware/adc_vbat/adc_vbat.ino b/libraries/Bluefruit52Lib/examples/Hardware/adc_vbat/adc_vbat.ino
@@ -1,4 +1,5 @@
 #include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 
 #if defined ARDUINO_NRF52840_CIRCUITPLAY
 #define  PIN_VBAT          A8   // this is just a mock read, we'll use the light sensor, so we can run the test
diff --git a/libraries/Bluefruit52Lib/examples/Hardware/blink_sleep/blink_sleep.ino b/libraries/Bluefruit52Lib/examples/Hardware/blink_sleep/blink_sleep.ino
@@ -11,6 +11,8 @@
   by Pierre Constantineau
 
 */
+#include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 #include <bluefruit.h>
 
 #define WAKE_LOW_PIN  PIN_A0
diff --git a/libraries/Bluefruit52Lib/examples/Hardware/blinky/blinky.ino b/libraries/Bluefruit52Lib/examples/Hardware/blinky/blinky.ino
@@ -18,6 +18,10 @@
   by Arturo Guadalupi
 */
 
+#include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
+
+
 // the setup function runs once when you press reset or power the board
 void setup() {
   // initialize digital pin LED_BUILTIN as an output.
diff --git a/libraries/Bluefruit52Lib/examples/Hardware/dfu_ota/dfu_ota.ino b/libraries/Bluefruit52Lib/examples/Hardware/dfu_ota/dfu_ota.ino
@@ -15,7 +15,7 @@
 /* This sketch invoke API to enter OTA dfu mode */
 
 #include <Arduino.h>
-
+#include <Adafruit_TinyUSB.h> // for Serial
 
 void setup() 
 {
diff --git a/libraries/Bluefruit52Lib/examples/Hardware/dfu_serial/dfu_serial.ino b/libraries/Bluefruit52Lib/examples/Hardware/dfu_serial/dfu_serial.ino
@@ -13,6 +13,7 @@
 *********************************************************************/
 
 #include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 
 /*
  * This sketch will reset the board into Serial DFU mode
diff --git a/libraries/Bluefruit52Lib/examples/Hardware/digital_interrupt_deferred/digital_interrupt_deferred.ino b/libraries/Bluefruit52Lib/examples/Hardware/digital_interrupt_deferred/digital_interrupt_deferred.ino
@@ -17,6 +17,7 @@
  * to defer callback from ISR context with attachInterrupt
  */
 #include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 
 int interruptPin = A0;
 
diff --git a/libraries/Bluefruit52Lib/examples/Hardware/fwinfo/fwinfo.ino b/libraries/Bluefruit52Lib/examples/Hardware/fwinfo/fwinfo.ino
@@ -13,7 +13,7 @@
 *********************************************************************/
 
 #include <Arduino.h>
-
+#include <Adafruit_TinyUSB.h> // for Serial
 
 void setup() 
 {
diff --git a/libraries/Bluefruit52Lib/examples/Hardware/gpstest_swuart/gpstest_swuart.ino b/libraries/Bluefruit52Lib/examples/Hardware/gpstest_swuart/gpstest_swuart.ino
@@ -20,6 +20,8 @@
  * - 
  */
 
+#include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 #include <SoftwareSerial.h>
 
 #define SW_RXD    A0
diff --git a/libraries/Bluefruit52Lib/examples/Hardware/hw_systick/hw_systick.ino b/libraries/Bluefruit52Lib/examples/Hardware/hw_systick/hw_systick.ino
@@ -12,6 +12,7 @@
  any redistribution
 *********************************************************************/
 #include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 
 // Interval between systick event
 #define TICK_INTERVAL_MS    50
diff --git a/libraries/Bluefruit52Lib/examples/Hardware/hwinfo/hwinfo.ino b/libraries/Bluefruit52Lib/examples/Hardware/hwinfo/hwinfo.ino
@@ -1,4 +1,5 @@
 #include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 
 typedef volatile uint32_t REG32;
 #define pREG32 (REG32 *)
diff --git a/libraries/Bluefruit52Lib/examples/Hardware/hwpwm/hwpwm.ino b/libraries/Bluefruit52Lib/examples/Hardware/hwpwm/hwpwm.ino
@@ -24,6 +24,7 @@
  */
 
 #include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 
 /**************************************************************************/
 /*!
diff --git a/libraries/Bluefruit52Lib/examples/Hardware/meminfo/meminfo.ino b/libraries/Bluefruit52Lib/examples/Hardware/meminfo/meminfo.ino
@@ -13,6 +13,7 @@
 *********************************************************************/
 
 #include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 
 
 void setup() 
diff --git a/libraries/Bluefruit52Lib/examples/Hardware/nfc_to_gpio/nfc_to_gpio.ino b/libraries/Bluefruit52Lib/examples/Hardware/nfc_to_gpio/nfc_to_gpio.ino
@@ -15,6 +15,9 @@
 // NFC pins to GPIO mode is a ONE WAY OPERATION and you will need a debugger
 // like a Segger J-Link to set them back to NFC mode!
 
+#include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
+
 void setup() {
   Serial.begin(115200);
   while ( !Serial ) delay(10);   // for nrf52840 with native usb
diff --git a/libraries/Bluefruit52Lib/examples/Hardware/rtos_scheduler/rtos_scheduler.ino b/libraries/Bluefruit52Lib/examples/Hardware/rtos_scheduler/rtos_scheduler.ino
@@ -13,6 +13,7 @@
 *********************************************************************/
 
 #include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 
 /*
  * Sketch demonstate mutli-task using Scheduler. Demo create loop2() that
diff --git a/libraries/Bluefruit52Lib/examples/Hardware/software_timer/software_timer.ino b/libraries/Bluefruit52Lib/examples/Hardware/software_timer/software_timer.ino
@@ -12,6 +12,7 @@
  any redistribution
 *********************************************************************/
 #include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 
 /* SoftwareTimer is a helper class that uses FreeRTOS software timer
  * to invoke callback. Its periodic timing is flexible as opposed to
diff --git a/libraries/Bluefruit52Lib/examples/Hardware/tone_happy_birthday/tone_happy_birthday.ino b/libraries/Bluefruit52Lib/examples/Hardware/tone_happy_birthday/tone_happy_birthday.ino
@@ -15,6 +15,7 @@
 // License: MIT (https://opensource.org/licenses/MIT)
 
 #include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 
 // PIN_BUZZER should be defined by the supported variant e.g CPlay Bluefruit or CLUE.
 // Otherwise please define the pin you would like to use for tone output
diff --git a/libraries/Bluefruit52Lib/library.properties b/libraries/Bluefruit52Lib/library.properties
@@ -8,4 +8,4 @@ category=Communication
 url=https://github.com/adafruit/Adafruit_nRF52_Arduino
 architectures=*
 includes=bluefruit.h
-depends=Adafruit nRFCrypto
+depends=Adafruit nRFCrypto, Adafruit TinyUSB Library
diff --git a/libraries/Bluefruit52Lib/src/bluefruit.h b/libraries/Bluefruit52Lib/src/bluefruit.h
@@ -26,6 +26,7 @@
 
 #include <Arduino.h>
 #include "bluefruit_common.h"
+#include <Adafruit_TinyUSB.h> // for Serial
 
 #define CFG_ADV_BLINKY_INTERVAL   500
 
diff --git a/libraries/Bluefruit52Lib/src/services/BLEHidGeneric.h b/libraries/Bluefruit52Lib/src/services/BLEHidGeneric.h
@@ -42,7 +42,7 @@
 #include "BLEService.h"
 
 // include usb hid definitions
-#include "tinyusb/src/class/hid/hid.h"
+#include "class/hid/hid.h"
 
 extern const uint8_t hid_ascii_to_keycode[128][2];
 extern const uint8_t hid_keycode_to_ascii[128][2];
diff --git a/libraries/InternalFileSytem/examples/Internal_Format/Internal_Format.ino b/libraries/InternalFileSytem/examples/Internal_Format/Internal_Format.ino
@@ -14,6 +14,7 @@
 
 #include <Adafruit_LittleFS.h>
 #include <InternalFileSystem.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 
 using namespace Adafruit_LittleFS_Namespace;
 
diff --git a/libraries/InternalFileSytem/examples/Internal_ListFiles/Internal_ListFiles.ino b/libraries/InternalFileSytem/examples/Internal_ListFiles/Internal_ListFiles.ino
@@ -14,6 +14,7 @@
 
 #include <Adafruit_LittleFS.h>
 #include <InternalFileSystem.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 
 using namespace Adafruit_LittleFS_Namespace;
 
diff --git a/libraries/InternalFileSytem/examples/Internal_ReadWrite/Internal_ReadWrite.ino b/libraries/InternalFileSytem/examples/Internal_ReadWrite/Internal_ReadWrite.ino
@@ -14,6 +14,7 @@
 
 #include <Adafruit_LittleFS.h>
 #include <InternalFileSystem.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 
 using namespace Adafruit_LittleFS_Namespace;
 
diff --git a/libraries/InternalFileSytem/examples/Internal_StressTest/Internal_StressTest.ino b/libraries/InternalFileSytem/examples/Internal_StressTest/Internal_StressTest.ino
@@ -14,6 +14,7 @@
 
 #include <Adafruit_LittleFS.h>
 #include <InternalFileSystem.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 
 // hardware random generator
 #include "nrf_rng.h"
diff --git a/libraries/PDM/src/PDM.h b/libraries/PDM/src/PDM.h
@@ -19,12 +19,12 @@
 #ifndef _PDM_H_INCLUDED
 #define _PDM_H_INCLUDED
 
-#include <Arduino.h>
-
 #if !defined(ARDUINO_NRF52_ADAFRUIT)
 #error "This library targets only Adafruit NRF52840 boards"
 #endif
 
+#include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 #include "utility/PDMDoubleBuffer.h"
 
 class PDMClass
diff --git a/libraries/RotaryEncoder/examples/HwEncoderCallback/HwEncoderCallback.ino b/libraries/RotaryEncoder/examples/HwEncoderCallback/HwEncoderCallback.ino
@@ -13,6 +13,7 @@
 *********************************************************************/
 
 #include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 #include "RotaryEncoder.h"
 
 #define PIN_A     A0
diff --git a/libraries/RotaryEncoder/examples/HwEncoderPoll/HwEncoderPoll.ino b/libraries/RotaryEncoder/examples/HwEncoderPoll/HwEncoderPoll.ino
@@ -13,6 +13,7 @@
 *********************************************************************/
 
 #include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 #include "RotaryEncoder.h"
 
 #define PIN_A     A0
diff --git a/libraries/RotaryEncoder/examples/SwEncoderCallback/SwEncoderCallback.ino b/libraries/RotaryEncoder/examples/SwEncoderCallback/SwEncoderCallback.ino
@@ -13,6 +13,7 @@
 *********************************************************************/
 
 #include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 #include "RotaryEncoder.h"
 
 #define PIN_A     A0
diff --git a/libraries/RotaryEncoder/examples/SwEncoderPoll/SwEncoderPoll.ino b/libraries/RotaryEncoder/examples/SwEncoderPoll/SwEncoderPoll.ino
@@ -13,6 +13,7 @@
 *********************************************************************/
 
 #include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 #include "RotaryEncoder.h"
 
 #define PIN_A     A0
diff --git a/libraries/SPI/SPI.h b/libraries/SPI/SPI.h
@@ -22,7 +22,7 @@
 #define _SPI_H_INCLUDED
 
 #include <Arduino.h>
-
+#include <Adafruit_TinyUSB.h> // for Serial
 #include "nrfx_spim.h"
 
 // SPI_HAS_TRANSACTION means SPI has
diff --git a/libraries/Servo/examples/Knob/Knob.ino b/libraries/Servo/examples/Knob/Knob.ino
@@ -7,6 +7,8 @@
  http://www.arduino.cc/en/Tutorial/Knob
 */
 
+#include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 #include <Servo.h>
 
 Servo myservo;  // create servo object to control a servo
diff --git a/libraries/Servo/examples/Sweep/Sweep.ino b/libraries/Servo/examples/Sweep/Sweep.ino
@@ -7,6 +7,8 @@
  http://www.arduino.cc/en/Tutorial/Sweep
 */
 
+#include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 #include <Servo.h>
 
 Servo myservo;  // create servo object to control a servo
diff --git a/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino b/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
@@ -15,6 +15,8 @@
 
  */
 
+#include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 #include <SoftwareSerial.h>
 
 SoftwareSerial mySerial(A0, A1); // RX, TX
diff --git a/libraries/SoftwareSerial/examples/TwoPortReceive/TwoPortReceive.ino b/libraries/SoftwareSerial/examples/TwoPortReceive/TwoPortReceive.ino
@@ -23,6 +23,8 @@
  
  */
 
+#include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 #include <SoftwareSerial.h>
 // software serial #1: TX = digital pin A1, RX = digital pin A0
 SoftwareSerial portOne(A0, A1);
diff --git a/libraries/Wire/Wire.h b/libraries/Wire/Wire.h
@@ -25,9 +25,10 @@
 
 #include "Stream.h"
 #include "variant.h"
-
 #include "RingBuffer.h"
 
+#include <Adafruit_TinyUSB.h> // for Serial
+
 // WIRE_HAS_END means Wire has end()
 #define WIRE_HAS_END 1
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,8 @@`
`18`	`18`	`* Note: Bluefruit nRF52832 does not support Serial1`
`19`	`19`	`*/`
`20`	`20`
`21`		`-#include "Arduino.h"`
	`21`	`+#include <Arduino.h>`
	`22`	`+#include <Adafruit_TinyUSB.h> // for Serial`
`22`	`23`
`23`	`24`	`void setup()`
`24`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include <Arduino.h>`
	`2`	`+#include <Adafruit_TinyUSB.h> // for Serial`
`2`	`3`
`3`	`4`	`#if defined ARDUINO_NRF52840_CIRCUITPLAY`
`4`	`5`	`#define PIN_VBAT A8 // this is just a mock read, we'll use the light sensor, so we can run the test`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`/* This sketch invoke API to enter OTA dfu mode */`
`16`	`16`
`17`	`17`	`#include <Arduino.h>`
`18`		`-`
	`18`	`+#include <Adafruit_TinyUSB.h> // for Serial`
`19`	`19`
`20`	`20`	`void setup()`
`21`	`21`	`{`