Skip to content

Commit cafa78c

Browse files
committed
fixing CI build. really now.
-check IDF target after including arduino.h -add missing build flags in [env:esp32s2_saola]
1 parent e808f76 commit cafa78c

File tree

3 files changed

+25
-4
lines changed

3 files changed

+25
-4
lines changed

platformio.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ platform = ${common.platform_wled_default}
276276
platform_packages = ${common.platform_packages}
277277
board_build.ldscript = ${common.ldscript_4m1m}
278278
build_unflags = ${common.build_unflags}
279-
build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP8266
279+
build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP8266 #-DWLED_DISABLE_2D
280280
lib_deps = ${esp8266.lib_deps}
281281
monitor_filters = esp8266_exception_decoder
282282

@@ -377,6 +377,7 @@ board_build.partitions = tools/WLED_ESP32_4MB_1MB_FS.csv
377377
board_build.flash_mode = qio
378378
upload_speed = 460800
379379
build_unflags = ${common.build_unflags}
380+
build_flags = ${common.build_flags} ${esp32s2.build_flags} #-D WLED_RELEASE_NAME=S2_saola
380381
lib_deps = ${esp32s2.lib_deps}
381382

382383
[env:esp32c3]

wled00/src/dependencies/dmx/SparkFunDMX.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ Distributed as-is; no warranty is given.
1414
******************************************************************************/
1515

1616
/* ----- LIBRARIES ----- */
17-
#if defined(ARDUINO_ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S2)
17+
#if defined(ARDUINO_ARCH_ESP32)
1818

1919
#include <Arduino.h>
20+
#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S2)
2021

2122
#include "SparkFunDMX.h"
2223
#include <HardwareSerial.h>
@@ -36,7 +37,9 @@ static const int txPin = 2; // transmit DMX data over this pin (default i
3637
//DMX value array and size. Entry 0 will hold startbyte
3738
static uint8_t dmxData[dmxMaxChannel] = { 0 };
3839
static int chanSize = 0;
40+
#if !defined(DMX_SEND_ONLY)
3941
static int currentChannel = 0;
42+
#endif
4043

4144
// Some new MCUs (-S2, -C3) don't have HardwareSerial(2)
4245
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 2, 0)
@@ -48,8 +51,10 @@ static int currentChannel = 0;
4851
static HardwareSerial DMXSerial(2);
4952

5053
/* Interrupt Timer for DMX Receive */
54+
#if !defined(DMX_SEND_ONLY)
5155
static hw_timer_t * timer = NULL;
5256
static portMUX_TYPE timerMux = portMUX_INITIALIZER_UNLOCKED;
57+
#endif
5358

5459
static volatile int _interruptCounter = 0;
5560
static volatile bool _startCodeDetected = false;
@@ -173,5 +178,5 @@ void SparkFunDMX::update() {
173178
}
174179

175180
// Function to update the DMX bus
176-
177-
#endif
181+
#endif
182+
#endif

wled00/wled00.ino.cpp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# 1 "C:\\Users\\Frank\\AppData\\Local\\Temp\\tmpr9svp7zf"
2+
#include <Arduino.h>
3+
# 1 "D:/ARDUINO_Work/WORK/#ESP32/WLED_soundreactive-GitHub_DEV/WLED-AC_main/WLED_main/wled00/wled00.ino"
4+
# 13 "D:/ARDUINO_Work/WORK/#ESP32/WLED_soundreactive-GitHub_DEV/WLED-AC_main/WLED_main/wled00/wled00.ino"
5+
#include "wled.h"
6+
void setup();
7+
void loop();
8+
#line 15 "D:/ARDUINO_Work/WORK/#ESP32/WLED_soundreactive-GitHub_DEV/WLED-AC_main/WLED_main/wled00/wled00.ino"
9+
void setup() {
10+
WLED::instance().setup();
11+
}
12+
13+
void loop() {
14+
WLED::instance().loop();
15+
}

0 commit comments

Comments
 (0)