Merge pull request #1870 from ladyada/master

Fix CI

Author: ladyada

2020_shake/2020.h

@@ -1,6 +1,6 @@
-# SPDX-FileCopyrightText: 2020 Limor Fried for Adafruit Industries
-#
-# SPDX-License-Identifier: MIT
+// SPDX-FileCopyrightText: 2020 Limor Fried for Adafruit Industries
+//
+// SPDX-License-Identifier: MIT
 
 #define BITMAP_WIDTH  64
 #define BITMAP_HEIGHT 32

2020_shake/2020_shake.ino

@@ -1,6 +1,6 @@
-# SPDX-FileCopyrightText: 2020 Limor Fried for Adafruit Industries
-#
-# SPDX-License-Identifier: MIT
+// SPDX-FileCopyrightText: 2020 Limor Fried for Adafruit Industries
+//
+// SPDX-License-Identifier: MIT
 
 #include <Adafruit_LIS3DH.h>      // For accelerometer
 #include <Adafruit_PixelDust.h>   // For simulation

2020_shake/2021.h

@@ -1,6 +1,6 @@
-# SPDX-FileCopyrightText: 2020 Limor Fried for Adafruit Industries
-#
-# SPDX-License-Identifier: MIT
+// SPDX-FileCopyrightText: 2020 Limor Fried for Adafruit Industries
+//
+// SPDX-License-Identifier: MIT
 
 const uint8_t PROGMEM bitmap_2021[] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

3D_Printed_Daft_Punk_Helmet/.trinket_5v.test.only renamed to 3D_Printed_Daft_Punk_Helmet/3D_Printed_Daft_Punk_Helmet-Front-Animation/.trinket_5v.test.only

@@ -26,7 +26,7 @@ struct {
 long fade; // Decreases brightness as wave moves
 
 // Gamma correction improves appearance of midrange colors
-uint8_t gamma[] PROGMEM = {
+const uint8_t gamma[] PROGMEM = {
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,
     1,  1,  1,  1,  1,  1,  1,  1,  1,  2,  2,  2,  2,  2,  2,  2,

3D_Printed_Daft_Punk_Helmet/3D_Printed_Daft_Punk_Helmet-Front-Animation.ino renamed to 3D_Printed_Daft_Punk_Helmet/3D_Printed_Daft_Punk_Helmet-Front-Animation/3D_Printed_Daft_Punk_Helmet-Front-Animation.ino

@@ -5,7 +5,11 @@
 * Rainbow swirl example for 3W LED.
 */
 
-#if defined(__SAMD21G18A__) || defined(__AVR_ATmega32U4__)
+#ifdef USE_TINYUSB  // For Serial when selecting TinyUSB
+#include <Adafruit_TinyUSB.h>
+#endif
+
+#if defined(__SAMD21G18A__) || defined(__AVR_ATmega32U4__) || defined(NRF52840_XXAA)
   // No green PWM on 32u4
   #define POWER_PIN    10
   #define RED_LED      11

Guitar_Hero_MIDI/.qtpy_m0.test.only renamed to 3D_Printed_Daft_Punk_Helmet/3D_Printed_Daft_Punk_Helmet-Side-Animation/.trinket_5v.test.only

@@ -6,10 +6,14 @@
 */
 #include <Adafruit_NeoPixel.h>
 
+#ifdef USE_TINYUSB  // For Serial when selecting TinyUSB
+#include <Adafruit_TinyUSB.h>
+#endif
+
 // NeoPixel strip length, in pixels
 #define NUM_PIXELS 30
 
-#if defined(__SAMD21G18A__) || defined(__AVR_ATmega32U4__)
+#if defined(__SAMD21G18A__) || defined(__AVR_ATmega32U4__) || defined(NRF52840_XXAA)
   #define NEOPIXEL_PIN 5
   #define POWER_PIN    10
 #elif defined(__AVR_ATmega328P__)

3D_Printed_Daft_Punk_Helmet/3D_Printed_Daft_Punk_Helmet-Side-Animation.ino renamed to 3D_Printed_Daft_Punk_Helmet/3D_Printed_Daft_Punk_Helmet-Side-Animation/3D_Printed_Daft_Punk_Helmet-Side-Animation.ino

@@ -5,7 +5,11 @@
 * Print to the Serial Montior when a switch is pressed.
 */
 
-#if defined(__SAMD21G18A__) || defined(__AVR_ATmega32U4__)
+#ifdef USE_TINYUSB  // For Serial when selecting TinyUSB
+#include <Adafruit_TinyUSB.h>
+#endif
+
+#if defined(__SAMD21G18A__) || defined(__AVR_ATmega32U4__) || defined(NRF52840_XXAA)
   #define SWITCH_PIN   9
 #elif defined(__AVR_ATmega328P__)
   #define SWITCH_PIN   9

Adafruit_Prop_Maker_FeatherWing/Prop_Maker_LED_Simpletest/Prop_Maker_LED_Simpletest.ino

@@ -22,7 +22,7 @@ LSM303 compass;
 
 #define LAT_LON_SIZE 311
 
-float lat_lon[LAT_LON_SIZE][2] PROGMEM = {
+const float lat_lon[LAT_LON_SIZE][2] PROGMEM = {
   {40.767272, -73.993928},
   {40.719115, -74.006666},
   {40.711174, -74.000165},
@@ -475,7 +475,7 @@ void loop()                     // run over and over again
       //Serial.print("Altitude: "); Serial.println(GPS.altitude);
       //Serial.print("Satellites: "); Serial.println((int)GPS.satellites);
       compass.read();
-      int heading = compass.heading((LSM303::vector){0,-1,0});
+      int heading = compass.heading((LSM303::vector<int16_t>){0,-1,0});
       Serial.print("Heading: ");
       Serial.println(heading);
       if ((calc_bearing(fLat, fLon, targetLat, targetLon) - heading) > 0) {
@@ -639,8 +639,8 @@ unsigned long calc_dist(float flat1, float flon1, float flat2, float flon2)
 int find_closest_location(float current_lat, float current_lon)
 {  
   int closest = 0;
-  unsigned long minDistance = -1;
-  unsigned long tempDistance;
+  signed long minDistance = -1;
+  signed long tempDistance;
   for (int i=0; i < LAT_LON_SIZE; i++) {
     float target_lat = pgm_read_float(&lat_lon[i][0]);
     float target_lon = pgm_read_float(&lat_lon[i][1]);
@@ -729,7 +729,7 @@ void GoForward (uint32_t c, uint8_t wait) {
 
 // Slightly different, this makes the rainbow equally distributed throughout
 void rainbowCycle(uint8_t wait) {
-  uint16_t i, j;
+  uint16_t i;
 
   //for(j=0; j<256*5; j++) { // 5 cycles of all colors on wheel
     for(i=0; i< 10; i++) {

Adafruit_Prop_Maker_FeatherWing/Prop_Maker_NeoPixel_Simpletest/Prop_Maker_NeoPixel_Simpletest.ino

@@ -134,7 +134,7 @@ void setup() {
   // in which they are initialized. HID MUST be initialized before
   // Serial, which must be initialized before the display.
 
-  int status = arcada.begin(); // Save status for Serial print later
+  int status = arcada.arcadaBegin(); // Save status for Serial print later
 
   // HID (keyboard) initialization
   usb_hid.setPollInterval(2);
@@ -157,7 +157,7 @@ void setup() {
   // Display initialization. This is all part of the persnickety sequence!
   arcada.displayBegin();
   arcada.setBacklight(255);
-  arcada.fillScreen(ARCADA_BLACK);
+  arcada.display->fillScreen(ARCADA_BLACK);
 
   // Audio initialization
   AudioMemory(10);
@@ -192,10 +192,10 @@ void setup() {
   }
 
   // At start, draw the entire blank/neutral face centered on screen
-  arcada.fillScreen(ARCADA_BLACK); // Erase any warnBoxes first
-  arcada.drawRGBBitmap(
-    (arcada.width()  - FACE_WIDTH ) / 2,
-    (arcada.height() - FACE_HEIGHT) / 2,
+  arcada.display->fillScreen(ARCADA_BLACK); // Erase any warnBoxes first
+  arcada.display->drawRGBBitmap(
+    (arcada.display->width()  - FACE_WIDTH ) / 2,
+    (arcada.display->height() - FACE_HEIGHT) / 2,
     (uint16_t *)face, FACE_WIDTH, FACE_HEIGHT);
 
   // Create an offscreen framebuffer that's just the bounding
@@ -426,7 +426,7 @@ void loop() {
   // while a screen update is currently in progress. (This is assuming
   // SPI DMA is enabled in Adafruit_SPITFT.h. If it is not, that's OK,
   // this function call simply compiles to nothing in that case.)
-  arcada.dmaWait();
+  arcada.display->dmaWait();
 
   if(openRows) {
     // Draw the open section of the eyes, then draw the pupils on top
@@ -484,7 +484,7 @@ void loop() {
   // is used...this is fastest as it can continue in the background
   // (while we process input on the next frame).
   arcada.blitFrameBuffer(
-    (arcada.width()  - FACE_WIDTH ) / 2 + 13,
-    (arcada.height() - FACE_HEIGHT) / 2 + 25,
+    (arcada.display->width()  - FACE_WIDTH ) / 2 + 13,
+    (arcada.display->height() - FACE_HEIGHT) / 2 + 25,
     false, true); // Non-blocking, big-endian
 }