GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-12 06:49:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '3.0' of https://github.com/luc-github/ESP3D into 3.0

Browse Source
This commit is contained in:
Luc 2024-01-19 15:48:31 +08:00
commit 13cdc37a1e
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/ci/build-esp3d.sh vendored
View File

@ -37,5 +37,8 @@ if [[ "$ide" == "arduino" ]];
arduino-builder -hardware "$ARDUINO_IDE_PATH/hardware" -tools "$ARDUINO_IDE_PATH/tools-builder" -tools "$ARDUINO_IDE_PATH/tools" -libraries "$ARDUINO_IDE_PATH/libraries" -fqbn=$fqbn -compile -logger=human -core-api-version=10810 ./esp3d/esp3d.ino
else
platformio run -e esp32dev
platformio run -e esp32-s2
platformio run -e esp32-s3
platformio run -e esp32-c3
platformio run -e esp8266dev
fi

2
esp3d/src/modules/serial/serial_service.cpp
View File

@ -36,7 +36,7 @@ HardwareSerial *Serials[MAX_SERIAL] = {&Serial, &Serial1};
#if defined(ARDUINO_ARCH_ESP32)
#if defined(CONFIG_IDF_TARGET_ESP32C3)
#if defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S2)
#define MAX_SERIAL 2
HardwareSerial *Serials[MAX_SERIAL] = {&Serial, &Serial1};
#else