From ff3ae01773375faf0a4d4886175e27184e5504b7 Mon Sep 17 00:00:00 2001 From: Gordon Williams Date: Fri, 6 Dec 2024 15:56:36 +0000 Subject: [PATCH] Fix STM32 bootloader build --- scripts/create_zip.sh | 19 ++++++++++++++++--- targets/stm32_boot/utils.c | 2 ++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/scripts/create_zip.sh b/scripts/create_zip.sh index ab188f4769..6c79e97365 100755 --- a/scripts/create_zip.sh +++ b/scripts/create_zip.sh @@ -39,8 +39,9 @@ echo Creating Documentation scripts/build_docs.py || { echo 'Build failed' ; exit 1; } mv $ESPRUINODIR/functions.html $ZIPDIR/functions.html -# Install everything -source scripts/provision.sh ALL +# Install all 'normal boards' +source scripts/provision.sh ESPRUINOBOARD +source scripts/provision.sh PIXLJS echo ------------------------------------------------------ echo Building Version $VERSION @@ -48,11 +49,23 @@ echo ------------------------------------------------------ # The following have been removed because it's too hard to keep the build going: # STM32F3DISCOVERY OLIMEXINO_STM32 HYSTM32_32 HYSTM32_28 HYSTM32_24 RAK8211 RAK8212 RUUVITAG THINGY52 RASPBERRYPI RAK5010 -for BOARDNAME in ESPRUINO_1V3 ESPRUINO_1V3_AT ESPRUINO_1V3_WIZ PICO_1V3 PICO_1V3_CC3000 PICO_1V3_WIZ ESPRUINOWIFI PUCKJS PUCKJS_MINIMAL PUCKJS_NETWORK PIXLJS PIXLJS_WIZ JOLTJS BANGLEJS BANGLEJS2 MDBT42Q NUCLEOF401RE NUCLEOF411RE STM32VLDISCOVERY STM32F4DISCOVERY STM32L496GDISCOVERY MICROBIT1 MICROBIT2 ESP8266_BOARD ESP8266_4MB ESP32 SMARTIBOT +for BOARDNAME in ESPRUINO_1V3 ESPRUINO_1V3_AT ESPRUINO_1V3_WIZ PICO_1V3 PICO_1V3_CC3000 PICO_1V3_WIZ ESPRUINOWIFI PUCKJS PUCKJS_MINIMAL PUCKJS_NETWORK PIXLJS PIXLJS_WIZ JOLTJS BANGLEJS BANGLEJS2 MDBT42Q NUCLEOF401RE NUCLEOF411RE STM32VLDISCOVERY STM32F4DISCOVERY STM32L496GDISCOVERY MICROBIT1 MICROBIT2 SMARTIBOT do scripts/create_zip_board.sh $BOARDNAME done +# Install Espressif stuff as it screws with Python + +source scripts/provision.sh ESP8266_4MB +source scripts/provision.sh ESP32 +source scripts/provision.sh ESP32C3_IDF4 + +for BOARDNAME in ESP8266_BOARD ESP8266_4MB ESP32 +do + scripts/create_zip_board.sh $BOARDNAME +done + + cd $ESPRUINODIR echo Copying README diff --git a/targets/stm32_boot/utils.c b/targets/stm32_boot/utils.c index ab36a1db80..2cc6add9d9 100644 --- a/targets/stm32_boot/utils.c +++ b/targets/stm32_boot/utils.c @@ -124,6 +124,8 @@ void jshDelayMicroseconds(int c) { void jshClearUSBIdleTimeout() { } +void jshHadEvent() {} + int _getc() { if (rxHead == rxTail) return -1; unsigned char d = (unsigned char)rxBuffer[rxTail];