Skip to content

Commit d3c9b46

Browse files
committed
fix
1 parent 5492bc7 commit d3c9b46

File tree

2 files changed

+36
-27
lines changed

2 files changed

+36
-27
lines changed

.github/workflows/ci.yml

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,44 +21,54 @@ jobs:
2121

2222
runs-on: ${{ matrix.os }}
2323
steps:
24-
- uses: actions/checkout@v4
24+
- name: Checkout code
25+
uses: actions/checkout@v4
2526
with:
26-
token: ${{ secrets.OSQ_REPO_TOKEN }}
27+
token: ${{ secrets.OSQ_REPO_TOKEN }}
28+
29+
- name: Setup MSYS2
30+
if: startsWith(matrix.os, 'windows') && startsWith(matrix.environment, 'emulator_64bits')
31+
uses: msys2/setup-msys2@v2
32+
with:
33+
msystem: mingw64
2734

2835

2936
- name: Setup Python
3037
uses: actions/setup-python@v5
3138
with:
32-
python-version: '3.11'
33-
architecture: 'x64'
39+
python-version: '3.11'
40+
architecture: 'x64'
3441

35-
- name: Install PlatformIO
42+
- name: Setup PlatformIO
3643
run: |
37-
python -m pip install --upgrade pip
38-
pip install -U platformio
39-
platformio update
44+
python -m pip install --upgrade pip
45+
pip install platformio
4046
41-
# - name: Install dependencies
42-
# run: |
43-
# pip install -U https://github.com/OS-Q/pio/archive/main.zip
47+
# - name: Install dependencies
48+
# run: |
49+
# pip install -U https://github.com/OS-Q/pio/archive/main.zip
4450

4551
- name: Run on Linux
4652
if: startsWith(matrix.os, 'ubuntu')
4753
run: |
48-
sudo apt-get update
49-
sudo apt-get install libsdl2-dev
50-
platformio run -e ${{ matrix.environment }}
54+
sudo apt-get update
55+
sudo apt-get install libsdl2-dev
56+
platformio run -e ${{ matrix.environment }}
5157
5258
- name: Run on macOS
5359
if: startsWith(matrix.os, 'macos')
5460
run: |
55-
HOMEBREW_NO_AUTO_UPDATE=1 brew install sdl2
56-
platformio run -e ${{ matrix.environment }}
61+
HOMEBREW_NO_AUTO_UPDATE=1 brew install sdl2
62+
platformio run -e ${{ matrix.environment }}
63+
64+
- name: Windows SDL2
65+
if: startsWith(matrix.os, 'windows') && startsWith(matrix.environment, 'emulator_64bits')
66+
shell: msys2 {0}
67+
run: |
68+
pacman --noconfirm -S mingw-w64-x86_64-gcc mingw-w64-x86_64-SDL2
69+
platformio run -e ${{ matrix.environment }}
5770
5871
- name: Run on Windows
59-
if: startsWith(matrix.os, 'windows')
60-
- uses: msys2/setup-msys2@v2
61-
with:
62-
msystem: mingw64
63-
install: mingw-w64-x86_64-SDL2
64-
run: platformio run -e ${{ matrix.environment }}
72+
if: startsWith(matrix.os, 'windows') && !startsWith(matrix.environment, 'emulator_64bits')
73+
run: |
74+
platformio run -e ${{ matrix.environment }}

src/main.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
******************************************************************************
33
* @file main.c
4-
* @author Ac6
4+
* @author
55
* @version V1.0
66
* @date 01-December-2024
77
* @brief Default main function.
@@ -14,9 +14,8 @@
1414

1515
int main(void)
1616
{
17-
lv_init();
18-
19-
hal_setup();
17+
lv_init();
18+
hal_setup();
2019
#if LV_USE_DEMO_BENCHMARK
2120
lv_demo_benchmark_set_max_speed(true);
2221
lv_demo_benchmark();
@@ -27,5 +26,5 @@ int main(void)
2726
#elif LV_USE_DEMO_MUSIC
2827
lv_demo_music();
2928
#endif
30-
hal_loop();
29+
hal_loop();
3130
}

0 commit comments

Comments
 (0)