Skip to content

Commit e2e800a

Browse files
committed
Add MICROPY_ROM_TEXT_COMPRESSION as target compile definition and coorect pipeline to include mp_jpeg
1 parent febc944 commit e2e800a

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.github/workflows/ESP32.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ jobs:
105105
- ESP32_GENERIC_S2
106106
- ESP32_GENERIC_S3
107107
- ESP32_GENERIC_S3-SPIRAM_OCT
108-
- ESP32_GENERIC_S3-FLASH_4M
109108
- ESP32_GENERIC-SPIRAM@WROVER_KIT
110109
- ESP32_GENERIC-SPIRAM@ESP_EYE
111110
- ESP32_GENERIC-SPIRAM@M5STACK_PSRAM
@@ -158,6 +157,7 @@ jobs:
158157
- name: Build MicroPython
159158
run: |
160159
cd ${{ github.workspace }}
160+
cd ..
161161
git clone https://github.com/cnadler86/mp_jpeg.git
162162
cd ~/esp-idf/components/esp32-camera
163163
CAM_DRIVER=$(git describe --tags --always --dirty)
@@ -169,9 +169,9 @@ jobs:
169169
IFS='-' read -r BOARD_NAME BOARD_VARIANT <<< "${BUILD_TARGET}"
170170
171171
if [ -n "${BOARD_VARIANT}" ]; then
172-
IDF_CMD="idf.py -D MICROPY_BOARD=$BOARD_NAME -D USER_C_MODULES=${{ github.workspace }}/src/micropython.cmake -D MICROPY_BOARD_VARIANT=$BOARD_VARIANT -B build-$BUILD_TARGET -D MP_CAMERA_DRIVER_VERSION=$CAM_DRIVER -D MP_JPEG_DIR=${{ github.workspace }}/mp_jpeg"
172+
IDF_CMD="idf.py -D MICROPY_BOARD=$BOARD_NAME -D USER_C_MODULES=${{ github.workspace }}/src/micropython.cmake -D MICROPY_BOARD_VARIANT=$BOARD_VARIANT -B build-$BUILD_TARGET -D MP_CAMERA_DRIVER_VERSION=$CAM_DRIVER"
173173
else
174-
IDF_CMD="idf.py -D MICROPY_BOARD=$BOARD_NAME -D USER_C_MODULES=${{ github.workspace }}/src/micropython.cmake -B build-$BUILD_TARGET -D MP_CAMERA_DRIVER_VERSION=$CAM_DRIVER -D MP_JPEG_DIR=${{ github.workspace }}/mp_jpeg"
174+
IDF_CMD="idf.py -D MICROPY_BOARD=$BOARD_NAME -D USER_C_MODULES=${{ github.workspace }}/src/micropython.cmake -B build-$BUILD_TARGET -D MP_CAMERA_DRIVER_VERSION=$CAM_DRIVER"
175175
fi
176176
if [ -n "${CAMERA_MODEL}" ]; then
177177
echo "FW_NAME=${CAMERA_MODEL}" >> $GITHUB_ENV

src/micropython.cmake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,11 @@ if (MP_CAMERA_DRIVER_VERSION)
8181
)
8282
endif()
8383

84+
# Camera module strings are not suitable for compression and cause size increase
85+
target_compile_definitions(usermod_mp_camera INTERFACE
86+
MICROPY_ROM_TEXT_COMPRESSION=0
87+
)
88+
8489
# Link the camera module with the main usermod target
8590
target_link_libraries(usermod INTERFACE usermod_mp_camera)
8691

0 commit comments

Comments
 (0)