Fix CI and use double matrix (#35)

Fix pipeline failing due to typo in ArduinoJson include, Fix pin deprecation warning, Add workaround for M5Stack not having a defined camera for now
This commit is contained in:
clienthax 2022-12-29 22:09:55 +00:00 committed by GitHub
parent e771132406
commit 5c7027f09b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 24 deletions

View File

@ -11,24 +11,20 @@ on:
jobs: jobs:
build: build:
strategy: strategy:
fail-fast: true fail-fast: false
matrix: matrix:
targets: [esp32CAM_release, target_name: [
# esp32AITinker_release, esp32AITinker,
# esp_eye_release, esp32M5Stack,
# esp32M5Stack_release, esp32CAM,
# wrover_release, esp_eye,
# esp32Cam, wrover,
# esp32AITinker,
# esp32M5Stack,
# esp_eye,
# wrover,
# esp32CAM_OTA,
# esp32AITinker_OTA,
# esp32M5Stack_OTA,
# esp_eye_OTA,
# wrover_OTA,
] ]
target_build_type: [
"",
_release,
_OTA,
]
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -44,27 +40,32 @@ jobs:
path: ~/.platformio path: ~/.platformio
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
- name: Setup Python install - name: Setup Python install
uses: actions/setup-python@v3 uses: actions/setup-python@v4
with:
python-version: '3.x'
- name: Install PlatformIO with Pip - name: Install PlatformIO with Pip
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install --upgrade platformio pip install --upgrade platformio
- name: Build OpenIris Firmware - name: Build OpenIris Firmware
working-directory: ./ESP working-directory: ./ESP
run: pio run --environment ${{ matrix.targets }} run: |
pio run --environment ${{ matrix.target_name }}${{ matrix.target_build_type }}
- name: Archive Version File - name: Archive Version File
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: version name: version
path: ./tools/version.txt path: ./ESP/tools/version.txt
- name: Archive Firmware name File - name: Archive Firmware name File
# create an environment variable with the name of the firmware file by catting the firmware_name.txt file # create an environment variable with the name of the firmware file by catting the firmware_name.txt file
run: echo "FIRMWARE_NAME=$(cat ./tools/firmware_name.txt)" >> $GITHUB_ENV run: |
echo "FIRMWARE_NAME=$(cat ./ESP/tools/firmware_name.txt)" >> $GITHUB_ENV
- name: Archive Firmware Files - name: Archive Firmware Files
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: ${{ matrix.targets }}-firmware name: ${{ matrix.target_name }}${{ matrix.target_build_type }}-firmware
path: "./ESP/.pio/build/${{ matrix.targets }}/$FIRMWARE_NAME.bin" path: "./ESP/.pio/build/${{ matrix.target_name }}${{ matrix.target_build_type }}/${{ env.FIRMWARE_NAME }}.bin"
if-no-files-found: error
release-openiris: release-openiris:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: [build] needs: [build]

View File

@ -6,7 +6,13 @@ CameraHandler::CameraHandler(ProjectConfig *configManager,
void CameraHandler::setupCameraPinout() void CameraHandler::setupCameraPinout()
{ {
// Workaround for espM5SStack not having a defined camera
#ifdef CAMERA_MODULE_NAME
log_i("Camera module is %s", CAMERA_MODULE_NAME); log_i("Camera module is %s", CAMERA_MODULE_NAME);
#else
log_i("Camera module is undefined");
#endif
#if CONFIG_CAMERA_MODULE_ESP_EYE #if CONFIG_CAMERA_MODULE_ESP_EYE
/* IO13, IO14 is designed for JTAG by default, /* IO13, IO14 is designed for JTAG by default,
* to use it as generalized input, * to use it as generalized input,
@ -40,8 +46,8 @@ void CameraHandler::setupCameraPinout()
config.pin_pclk = PCLK_GPIO_NUM; config.pin_pclk = PCLK_GPIO_NUM;
config.pin_vsync = VSYNC_GPIO_NUM; config.pin_vsync = VSYNC_GPIO_NUM;
config.pin_href = HREF_GPIO_NUM; config.pin_href = HREF_GPIO_NUM;
config.pin_sscb_sda = SIOD_GPIO_NUM; config.pin_sccb_sda = SIOD_GPIO_NUM;
config.pin_sscb_scl = SIOC_GPIO_NUM; config.pin_sccb_scl = SIOC_GPIO_NUM;
config.pin_pwdn = PWDN_GPIO_NUM; config.pin_pwdn = PWDN_GPIO_NUM;
config.pin_reset = RESET_GPIO_NUM; config.pin_reset = RESET_GPIO_NUM;
config.xclk_freq_hz = 16500000; // 10000000 stable, config.xclk_freq_hz = 16500000; // 10000000 stable,