diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc1ecec..6ac33c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,44 +21,52 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v4 + - name: Checkout code + uses: actions/checkout@v4 with: - token: ${{ secrets.OSQ_REPO_TOKEN }} + token: ${{ secrets.OSQ_REPO_TOKEN }} + - name: Setup MSYS2 + if: startsWith(matrix.os, 'windows') && startsWith(matrix.environment, 'emulator_64bits') + uses: msys2/setup-msys2@v2 + with: + msystem: mingw64 + + - name: Setup SDL2 + if: startsWith(matrix.os, 'windows') && startsWith(matrix.environment, 'emulator_64bits') + shell: msys2 {0} + run: | + pacman --noconfirm -S mingw-w64-x86_64-gcc mingw-w64-x86_64-SDL2 - name: Setup Python uses: actions/setup-python@v5 with: - python-version: '3.11' - architecture: 'x64' + python-version: '3.11' + architecture: 'x64' - - name: Install PlatformIO + - name: Setup PlatformIO run: | - python -m pip install --upgrade pip - pip install -U platformio - platformio update + python -m pip install --upgrade pip + pip install platformio - # - name: Install dependencies - # run: | - # pip install -U https://github.com/OS-Q/pio/archive/main.zip + # - name: Install dependencies + # run: | + # pip install -U https://github.com/OS-Q/pio/archive/main.zip - name: Run on Linux if: startsWith(matrix.os, 'ubuntu') run: | - sudo apt-get update - sudo apt-get install libsdl2-dev - platformio run -e ${{ matrix.environment }} + sudo apt-get update + sudo apt-get install libsdl2-dev + platformio run -e ${{ matrix.environment }} - name: Run on macOS if: startsWith(matrix.os, 'macos') run: | - HOMEBREW_NO_AUTO_UPDATE=1 brew install sdl2 - platformio run -e ${{ matrix.environment }} + HOMEBREW_NO_AUTO_UPDATE=1 brew install sdl2 + platformio run -e ${{ matrix.environment }} - name: Run on Windows if: startsWith(matrix.os, 'windows') - - uses: msys2/setup-msys2@v2 - with: - msystem: mingw64 - install: mingw-w64-x86_64-SDL2 - run: platformio run -e ${{ matrix.environment }} \ No newline at end of file + run: | + platformio run -e ${{ matrix.environment }} diff --git a/src/main.c b/src/main.c index 41ff65e..91f9648 100644 --- a/src/main.c +++ b/src/main.c @@ -1,7 +1,7 @@ /** ****************************************************************************** * @file main.c - * @author Ac6 + * @author * @version V1.0 * @date 01-December-2024 * @brief Default main function. @@ -14,9 +14,8 @@ int main(void) { - lv_init(); - - hal_setup(); + lv_init(); + hal_setup(); #if LV_USE_DEMO_BENCHMARK lv_demo_benchmark_set_max_speed(true); lv_demo_benchmark(); @@ -27,5 +26,5 @@ int main(void) #elif LV_USE_DEMO_MUSIC lv_demo_music(); #endif - hal_loop(); + hal_loop(); }