Skip to content

Commit 5f20829

Browse files
authored
Merge branch 'NSPanel' into Nspanel
2 parents 61d65b0 + 4492371 commit 5f20829

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

Diff for: .github/workflows/push.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: ESP32 builder v4.4.1
1+
name: ESP32 Arduino NSPanel
22

33
on:
44
workflow_dispatch: # Manually start a workflow

Diff for: build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if ! [ -x "$(command -v git)" ]; then
1010
exit 1
1111
fi
1212

13-
TARGET="all"
13+
TARGET="esp32"
1414
BUILD_TYPE="all"
1515
SKIP_ENV=0
1616
COPY_OUT=0
@@ -177,7 +177,7 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
177177
done
178178

179179
# archive the build
180-
if [ "$TARGET" = "all" ] && [ "$BUILD_TYPE" = "all" ]; then
180+
if [ "$BUILD_TYPE" = "all" ]; then
181181
./tools/archive-build.sh
182182
if [ $? -ne 0 ]; then exit 1; fi
183183
fi

Diff for: configs/defconfig.esp32

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ CONFIG_SPIRAM_BOOT_INIT=y
2828
CONFIG_SPIRAM_IGNORE_NOTFOUND=y
2929
CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
3030
CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0
31+
CONFIG_D0WD_PSRAM_CLK_IO=5
32+
CONFIG_D0WD_PSRAM_CS_IO=1
3133
CONFIG_ESP32_XTAL_FREQ_AUTO=y
3234
CONFIG_ETH_SPI_ETHERNET_DM9051=y
3335
CONFIG_ETH_SPI_ETHERNET_W5500=y

Diff for: core_version.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#define ARDUINO_ESP32_GIT_VER 0x6ed33835
2-
#define ARDUINO_ESP32_GIT_DESC 2.0.4dev
3-
#define ARDUINO_ESP32_RELEASE_2_0_4dev
4-
#define ARDUINO_ESP32_RELEASE "2_0_4dev"
2+
#define ARDUINO_ESP32_GIT_DESC 2.0.3
3+
#define ARDUINO_ESP32_RELEASE_2_0_3
4+
#define ARDUINO_ESP32_RELEASE "2_0_3"

0 commit comments

Comments
 (0)