archive-gh-me/Espruino
1
0
Fork 0
mirror of https://github.com/espruino/Espruino.git synced 2025-12-08 19:06:15 +00:00
Code Issues Projects Releases Wiki Activity

ensure we do releases for C3+S3, and re-enable USB CDC comms on S3 build

Browse Source
This commit is contained in:
Gordon Williams 2024-12-13 15:17:57 +00:00
parent cd8ed7c142
commit af38afd77b
4 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/ESP32C3_IDF4.py
View File

@ -74,7 +74,7 @@ info = {
'DEFINES+=-DESP_STACK_SIZE=25000',
'DEFINES+=-DJSVAR_MALLOC', # Allocate space for variables at jsvInit time
'DEFINES+=-DUSE_FONT_6X8',
'DEFINES+=-DUSB_CDC', # Disable USB_CDC if board has uart interface
'DEFINES+=-DUSB_CDC', # Comment out to disable USB_CDC if board has uart interface
'ESP32_FLASH_MAX=1572864'
]
}

1
boards/ESP32S3_IDF4.py
View File

@ -74,6 +74,7 @@ info = {
'DEFINES+=-DESP_STACK_SIZE=25000',
'DEFINES+=-DJSVAR_MALLOC', # Allocate space for variables at jsvInit time
'DEFINES+=-DUSE_FONT_6X8',
'DEFINES+=-DUSB_CDC', # Comment out to disable USB_CDC if board has uart interface
'ESP32_FLASH_MAX=1572864'
]
}

3
scripts/create_zip.sh
View File

@ -59,8 +59,9 @@ done
source scripts/provision.sh ESP8266_4MB
source scripts/provision.sh ESP32
source scripts/provision.sh ESP32C3_IDF4
source scripts/provision.sh ESP32S3_IDF4
for BOARDNAME in ESP8266_BOARD ESP8266_4MB ESP32
for BOARDNAME in ESP8266_BOARD ESP8266_4MB ESP32 ESP32C3_IDF4 ESP32S3_IDF4
do
scripts/create_zip_board.sh $BOARDNAME
done

24
scripts/create_zip_board.sh
View File

@ -88,6 +88,16 @@ fi
if [ "$BOARDNAME" == "PICO_1V3" ]; then
BOARDNAME=PICO_R1_3
fi
if [ "$BOARDNAME" == "ESP32C3_IDF4" ] || [ "$BOARDNAME" == "ESP32S3_IDF4" ]; then
echo "WARNING!!! ESP32C3/S3 can't work with custom build dirs for some reason"
EXTRADEFS="" # ignore custom build dirs
rm -rf $BINDIR
rm -rf $OBJDIR
rm -rf $GENDIR
BINDIR=bin
OBJDIR=obj
GENDIR=gen
fi
# actually build
ESP_BINARY_NAME=`python scripts/get_board_info.py $BOARDNAME "common.get_board_binary_name(board)"`
@ -174,7 +184,7 @@ elif [ "$BOARDNAME" == "ESP8266_4MB" ]; then
else
echo Copying ${BINDIR}/${ESP_BINARY_NAME} to $ZIPDIR/$NEW_BINARY_NAME
cp ${BINDIR}/${ESP_BINARY_NAME} $ZIPDIR/$NEW_BINARY_NAME || { echo "Build of 'BOARD=$BOARDNAME make' failed" ; exit 255; }
if [ "$BOARDNAME" == "ESP32" ]; then
if [[ "$BOARDNAME" =~ ^ESP32.* ]]; then
tar -C $ZIPDIR -xzf ${BINDIR}/`basename $ESP_BINARY_NAME .bin`.tgz || { echo "Build of 'BOARD=$BOARDNAME make' failed" ; exit 255; }
fi
fi
@ -184,7 +194,13 @@ if [ -n "$ESP_BINARY2_NAME" ]; then
fi
rm $LOGFILE
rm -rf $BINDIR
rm -rf $OBJDIR
rm -rf $GENDIR
if [ "$BINDIR" != "bin" ] ; then
rm -rf $BINDIR
fi
if [ "$OBJDIR" != "obj" ] ; then
rm -rf $OBJDIR
fi
if [ "$GENDIR" != "gen" ] ; then
rm -rf $GENDIR
fi