Skip to content

Commit 64a94cf

Browse files
ladyadaladyada
authored
Merge pull request #1870 from ladyada/master
Fix CI
2 parents 7c04b66 + 54e04a8 commit 64a94cf

32 files changed

Lines changed: 105 additions & 90 deletions

File tree

‎2020_shake/2020.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# SPDX-FileCopyrightText: 2020 Limor Fried for Adafruit Industries
2-
#
3-
# SPDX-License-Identifier: MIT
1+
// SPDX-FileCopyrightText: 2020 Limor Fried for Adafruit Industries
2+
//
3+
// SPDX-License-Identifier: MIT
44

55
#define BITMAP_WIDTH 64
66
#define BITMAP_HEIGHT 32

‎2020_shake/2020_shake.ino‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# SPDX-FileCopyrightText: 2020 Limor Fried for Adafruit Industries
2-
#
3-
# SPDX-License-Identifier: MIT
1+
// SPDX-FileCopyrightText: 2020 Limor Fried for Adafruit Industries
2+
//
3+
// SPDX-License-Identifier: MIT
44

55
#include <Adafruit_LIS3DH.h> // For accelerometer
66
#include <Adafruit_PixelDust.h> // For simulation

‎2020_shake/2021.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# SPDX-FileCopyrightText: 2020 Limor Fried for Adafruit Industries
2-
#
3-
# SPDX-License-Identifier: MIT
1+
// SPDX-FileCopyrightText: 2020 Limor Fried for Adafruit Industries
2+
//
3+
// SPDX-License-Identifier: MIT
44

55
const uint8_t PROGMEM bitmap_2021[] = {
66
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

File renamed without changes.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ struct {
2626
long fade; // Decreases brightness as wave moves
2727

2828
// Gamma correction improves appearance of midrange colors
29-
uint8_t gamma[] PROGMEM = {
29+
const uint8_t gamma[] PROGMEM = {
3030
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
3131
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
3232
1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2,

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

File renamed without changes.

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

File renamed without changes.

‎Adafruit_Prop_Maker_FeatherWing/Prop_Maker_LED_Simpletest/Prop_Maker_LED_Simpletest.ino‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
* Rainbow swirl example for 3W LED.
66
*/
77

8-
#if defined(__SAMD21G18A__) || defined(__AVR_ATmega32U4__)
8+
#ifdef USE_TINYUSB // For Serial when selecting TinyUSB
9+
#include <Adafruit_TinyUSB.h>
10+
#endif
11+
12+
#if defined(__SAMD21G18A__) || defined(__AVR_ATmega32U4__) || defined(NRF52840_XXAA)
913
// No green PWM on 32u4
1014
#define POWER_PIN 10
1115
#define RED_LED 11

‎Adafruit_Prop_Maker_FeatherWing/Prop_Maker_NeoPixel_Simpletest/Prop_Maker_NeoPixel_Simpletest.ino‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@
66
*/
77
#include <Adafruit_NeoPixel.h>
88

9+
#ifdef USE_TINYUSB // For Serial when selecting TinyUSB
10+
#include <Adafruit_TinyUSB.h>
11+
#endif
12+
913
// NeoPixel strip length, in pixels
1014
#define NUM_PIXELS 30
1115

12-
#if defined(__SAMD21G18A__) || defined(__AVR_ATmega32U4__)
16+
#if defined(__SAMD21G18A__) || defined(__AVR_ATmega32U4__) || defined(NRF52840_XXAA)
1317
#define NEOPIXEL_PIN 5
1418
#define POWER_PIN 10
1519
#elif defined(__AVR_ATmega328P__)

‎Adafruit_Prop_Maker_FeatherWing/Prop_Maker_Switch_Simpletest/Prop_Maker_Switch_Simpletest.ino‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
* Print to the Serial Montior when a switch is pressed.
66
*/
77

8-
#if defined(__SAMD21G18A__) || defined(__AVR_ATmega32U4__)
8+
#ifdef USE_TINYUSB // For Serial when selecting TinyUSB
9+
#include <Adafruit_TinyUSB.h>
10+
#endif
11+
12+
#if defined(__SAMD21G18A__) || defined(__AVR_ATmega32U4__) || defined(NRF52840_XXAA)
913
#define SWITCH_PIN 9
1014
#elif defined(__AVR_ATmega328P__)
1115
#define SWITCH_PIN 9

0 commit comments

Comments
 (0)