Skip to content

Commit ee9cf9f

Browse files
Minor changes for compatibility with latest ESP32 headers
1 parent b9d2737 commit ee9cf9f

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

RGBmatrixPanel.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,8 @@ void RGBmatrixPanel::begin(void) {
344344
tim_config.divider = 2; // Run Timer at 40 MHz
345345
tim_config.counter_dir = TIMER_COUNT_UP;
346346
tim_config.counter_en = TIMER_PAUSE;
347-
tim_config.alarm_en = true;
348-
tim_config.auto_reload = true;
347+
tim_config.alarm_en = TIMER_ALARM_EN;
348+
tim_config.auto_reload = TIMER_AUTORELOAD_EN;
349349
tim_config.intr_type = TIMER_INTR_LEVEL;
350350

351351
timer_init(TIMER_GROUP_1, TIMER_0, &tim_config);
@@ -912,7 +912,7 @@ static timg_dev_t *TG[2] = {&TIMERG0, &TIMERG1};
912912
static portMUX_TYPE timer_spinlock[TIMER_GROUP_MAX] = {
913913
portMUX_INITIALIZER_UNLOCKED, portMUX_INITIALIZER_UNLOCKED};
914914
portENTER_CRITICAL(&timer_spinlock[TIMER_GROUP_1]);
915-
TG[TIMER_GROUP_1]->hw_timer[TIMER_0].alarm_high = (uint32_t)(duration >> 32);
915+
TG[TIMER_GROUP_1]->hw_timer[TIMER_0].alarm_high = 0;
916916
TG[TIMER_GROUP_1]->hw_timer[TIMER_0].alarm_low = (uint32_t)duration;
917917
portEXIT_CRITICAL(&timer_spinlock[TIMER_GROUP_1]);
918918
#endif // ARDUINO_ARCH_SAMD

examples/scrolltext_16x32/scrolltext_16x32.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RGBmatrixPanel matrix(A, B, C, CLK, LAT, OE, true);
3636

3737
const char str[] PROGMEM = "Adafruit 16x32 RGB LED Matrix";
3838
int16_t textX = matrix.width(),
39-
textMin = sizeof(str) * -12,
39+
textMin = (int16_t)sizeof(str) * -12,
4040
hue = 0;
4141
int8_t ball[3][4] = {
4242
{ 3, 0, 1, 1 }, // Initial X,Y pos & velocity for 3 bouncy balls

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=RGB matrix Panel
2-
version=1.1.5
2+
version=1.1.6
33
author=Adafruit
44
maintainer=Adafruit <[email protected]>
55
sentence=Arduino library and example code for the 16x32 RGB matrix panels in the shop

0 commit comments

Comments
 (0)