Skip to content

Commit 4b68ab7

Browse files
authored
Reformat with git add --renormalize . (#644)
1 parent 7ae3a71 commit 4b68ab7

File tree

10 files changed

+1129
-1129
lines changed

10 files changed

+1129
-1129
lines changed
Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
1-
name: C++ CI Serial Programs
2-
3-
on: [push, pull_request, workflow_dispatch]
4-
5-
jobs:
6-
build:
7-
runs-on: ${{ matrix.os }}
8-
9-
strategy:
10-
fail-fast: false
11-
matrix:
12-
os: [windows-2025, macos-13, ubuntu-24.04]
13-
qt_version: ['6.9.0']
14-
include:
15-
- qt_version: '6.9.0'
16-
qt_version_major: '6'
17-
qt_modules: 'qtmultimedia qtserialport'
18-
19-
steps:
20-
- uses: actions/checkout@v4
21-
with:
22-
path: Arduino-Source
23-
- uses: actions/checkout@v4
24-
with:
25-
repository: 'PokemonAutomation/Packages'
26-
path: Packages
27-
- name: Install dependencies
28-
if: startsWith(matrix.os, 'ubuntu')
29-
run: |
30-
sudo apt update
31-
sudo apt install libopencv-dev
32-
- name: Install dependencies
33-
if: startsWith(matrix.os, 'mac')
34-
run: |
35-
brew install opencv onnxruntime
36-
- uses: jurplel/install-qt-action@v4
37-
with:
38-
version: ${{ matrix.qt_version }}
39-
modules: ${{ matrix.qt_modules }}
40-
- name: Generate binaries
41-
run: |
42-
cd Arduino-Source/SerialPrograms
43-
mkdir bin
44-
cd bin
45-
cmake .. -DQT_MAJOR:STRING=${{ matrix.qt_version_major }}
46-
cmake --build . --config Release --parallel 10
47-
- name: Copy resources
48-
if: startsWith(matrix.os, 'windows')
49-
run: |
50-
robocopy Packages/SerialPrograms/Resources Output/Resources /s
51-
robocopy Packages/PABotBase/PABotBase-Switch Output/PABotBase /s
52-
robocopy Arduino-Source/SerialPrograms/bin Output/Binaries *.dll
53-
robocopy Arduino-Source/SerialPrograms/bin/Release Output/Binaries SerialPrograms.exe
54-
echo https://github.com/${{github.repository}}/commit/${{github.sha}} > Output/version.txt
55-
write-host "Robocopy exited with exit code:" $lastexitcode
56-
if ($lastexitcode -eq 1)
57-
{
58-
exit 0
59-
}
60-
else
61-
{
62-
exit 1
63-
}
64-
- uses: actions/upload-artifact@v4
65-
if: startsWith(matrix.os, 'windows')
66-
with:
67-
name: Serial Programs for windows (${{ matrix.qt_version }})
68-
path: Output
1+
name: C++ CI Serial Programs
2+
3+
on: [push, pull_request, workflow_dispatch]
4+
5+
jobs:
6+
build:
7+
runs-on: ${{ matrix.os }}
8+
9+
strategy:
10+
fail-fast: false
11+
matrix:
12+
os: [windows-2025, macos-13, ubuntu-24.04]
13+
qt_version: ['6.9.0']
14+
include:
15+
- qt_version: '6.9.0'
16+
qt_version_major: '6'
17+
qt_modules: 'qtmultimedia qtserialport'
18+
19+
steps:
20+
- uses: actions/checkout@v4
21+
with:
22+
path: Arduino-Source
23+
- uses: actions/checkout@v4
24+
with:
25+
repository: 'PokemonAutomation/Packages'
26+
path: Packages
27+
- name: Install dependencies
28+
if: startsWith(matrix.os, 'ubuntu')
29+
run: |
30+
sudo apt update
31+
sudo apt install libopencv-dev
32+
- name: Install dependencies
33+
if: startsWith(matrix.os, 'mac')
34+
run: |
35+
brew install opencv onnxruntime
36+
- uses: jurplel/install-qt-action@v4
37+
with:
38+
version: ${{ matrix.qt_version }}
39+
modules: ${{ matrix.qt_modules }}
40+
- name: Generate binaries
41+
run: |
42+
cd Arduino-Source/SerialPrograms
43+
mkdir bin
44+
cd bin
45+
cmake .. -DQT_MAJOR:STRING=${{ matrix.qt_version_major }}
46+
cmake --build . --config Release --parallel 10
47+
- name: Copy resources
48+
if: startsWith(matrix.os, 'windows')
49+
run: |
50+
robocopy Packages/SerialPrograms/Resources Output/Resources /s
51+
robocopy Packages/PABotBase/PABotBase-Switch Output/PABotBase /s
52+
robocopy Arduino-Source/SerialPrograms/bin Output/Binaries *.dll
53+
robocopy Arduino-Source/SerialPrograms/bin/Release Output/Binaries SerialPrograms.exe
54+
echo https://github.com/${{github.repository}}/commit/${{github.sha}} > Output/version.txt
55+
write-host "Robocopy exited with exit code:" $lastexitcode
56+
if ($lastexitcode -eq 1)
57+
{
58+
exit 0
59+
}
60+
else
61+
{
62+
exit 1
63+
}
64+
- uses: actions/upload-artifact@v4
65+
if: startsWith(matrix.os, 'windows')
66+
with:
67+
name: Serial Programs for windows (${{ matrix.qt_version }})
68+
path: Output

.gitignore

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
1-
SerialPrograms/bin/
2-
3-
.vscode
4-
5-
# macOS hidden system file
6-
.DS_Store
7-
8-
build-*/
9-
build/
10-
11-
# Qt config file on a user basis
12-
*.pro.user
13-
14-
# all other common C++ ignorables
15-
# Prerequisites
16-
*.d
17-
18-
# Compiled Object files
19-
*.slo
20-
*.lo
21-
*.o
22-
*.obj
23-
24-
# Precompiled Headers
25-
*.gch
26-
*.pch
27-
28-
# Compiled Dynamic libraries
29-
SerialPrograms/*.so
30-
SerialPrograms/*.dylib
31-
SerialPrograms/*.dll
32-
33-
# Fortran module files
34-
*.mod
35-
*.smod
36-
37-
# Compiled Static libraries
38-
SerialPrograms/*.lai
39-
SerialPrograms/*.la
40-
SerialPrograms/*.a
41-
SerialPrograms/*.lib
42-
43-
# Executables
44-
*.exe
45-
*.out
46-
*.app
47-
48-
.vs
49-
Resources/*
50-
SerialPrograms/CMakeLists.txt.user
51-
opencv_world4110d.dll
52-
53-
# Python cache
54-
__pycache__
55-
56-
# Jupyter Notebooks
57-
*.ipynb
1+
SerialPrograms/bin/
2+
3+
.vscode
4+
5+
# macOS hidden system file
6+
.DS_Store
7+
8+
build-*/
9+
build/
10+
11+
# Qt config file on a user basis
12+
*.pro.user
13+
14+
# all other common C++ ignorables
15+
# Prerequisites
16+
*.d
17+
18+
# Compiled Object files
19+
*.slo
20+
*.lo
21+
*.o
22+
*.obj
23+
24+
# Precompiled Headers
25+
*.gch
26+
*.pch
27+
28+
# Compiled Dynamic libraries
29+
SerialPrograms/*.so
30+
SerialPrograms/*.dylib
31+
SerialPrograms/*.dll
32+
33+
# Fortran module files
34+
*.mod
35+
*.smod
36+
37+
# Compiled Static libraries
38+
SerialPrograms/*.lai
39+
SerialPrograms/*.la
40+
SerialPrograms/*.a
41+
SerialPrograms/*.lib
42+
43+
# Executables
44+
*.exe
45+
*.out
46+
*.app
47+
48+
.vs
49+
Resources/*
50+
SerialPrograms/CMakeLists.txt.user
51+
opencv_world4110d.dll
52+
53+
# Python cache
54+
__pycache__
55+
56+
# Jupyter Notebooks
57+
*.ipynb

IconResource/IconResource.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
IDI_ICON1 ICON "icon.ico"
1+
IDI_ICON1 ICON "icon.ico"

LICENSE

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
MIT License
2-
3-
Copyright (c) 2021 Alexander J. Yee
4-
5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
11-
12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
14-
15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
1+
MIT License
2+
3+
Copyright (c) 2021 Alexander J. Yee
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

0 commit comments

Comments
 (0)