Skip to content

Commit

Permalink
fix actions, add images
Browse files Browse the repository at this point in the history
Signed-off-by: swurl <[email protected]>
  • Loading branch information
crueter committed Sep 1, 2024
1 parent b56c309 commit 9c29092
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 16 deletions.
32 changes: 16 additions & 16 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,23 @@ jobs:

- os: ubuntu-20.04
qt_host: linux
qt_version: '6.6.0'
qt_version: '6.7.1'
qt_arch: gcc_64

- os: ubuntu-20.04
qt_host: linux
qt_target: android
qt_arch: android_arm64_v8a
qt_version: '6.6.0'
qt_version: '6.7.1'

- os: ubuntu-20.04
qt_host: linux
qt_version: '6.6.0'
qt_arch: wasm_singlethread
qt_version: '6.7.1'
qt_arch: wasm_multithread

- os: windows-2022
qt_host: windows
qt_version: '6.6.0'
qt_version: '6.7.1'
qt_arch: win64_msvc2019_64

runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -72,19 +72,19 @@ jobs:
- name: Install CMake
uses: lukka/[email protected]

- name: Install Qt 6.6.0
- name: Install Qt ${{ matrix.qt_version }}
uses: jurplel/[email protected]
with:
cache: on
version: 6.6.0
version: ${{ matrix.qt_version }}
aqtversion: ==3.1.*

- name: Install Qt (WASM)
if: matrix.qt_arch == 'wasm_singlethread'
if: matrix.qt_arch == 'wasm_multithread'
uses: jurplel/[email protected]
with:
cache: on
version: 6.6.0
version: ${{ matrix.qt_version }}
aqtversion: ==3.1.*
arch: ${{ matrix.qt_arch }}

Expand All @@ -93,7 +93,7 @@ jobs:
uses: jurplel/[email protected]
with:
cache: on
version: 6.6.0
version: ${{ matrix.qt_version }}
aqtversion: ==3.1.*
target: ${{ matrix.qt_target }}
arch: ${{ matrix.qt_arch }}
Expand All @@ -107,7 +107,7 @@ jobs:
wget "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage"
- name: Prepare Emscripten (Linux)
if: runner.os == 'Linux' && matrix.qt_arch == 'wasm_singlethread'
if: runner.os == 'Linux' && matrix.qt_arch == 'wasm_multithread'
uses: mymindstorm/setup-emsdk@v13
with:
# Version to install
Expand Down Expand Up @@ -171,7 +171,7 @@ jobs:
mkdir -p ${{ env.INSTALL_APPIMAGE_DIR }}/usr/plugins/iconengines
cp -r /home/runner/work/QFRCScouter/Qt/${{ matrix.qt_version }}/gcc_64/plugins/iconengines/* ${{ env.INSTALL_APPIMAGE_DIR }}/usr/plugins/iconengines
cp -r ${{ runner.workspace }}/Qt/${{ matrix.qt_version }}/gcc_64/plugins/ ${{ env.INSTALL_APPIMAGE_DIR }}/usr/
cp /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 ${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/
cp /usr/lib/x86_64-linux-gnu/libssl.so.1.1 ${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/
Expand All @@ -183,7 +183,7 @@ jobs:
shell: cmd
run: |
mkdir ${{ env.INSTALL_DIR }}
set PATH=%PATH%;"${{ runner.workspace }}\Qt\6.6.0\msvc2019_64\bin"
set PATH=%PATH%;"${{ runner.workspace }}\Qt\${{ matrix.qt_version }}\msvc2019_64\bin"
windeployqt ${{ env.BUILD_DIR }}\QFRCScouter.exe --dir ${{ env.INSTALL_DIR }}
cp ${{ env.BUILD_DIR }}\QFRCScouter.exe ${{ env.INSTALL_DIR }}
Expand All @@ -200,21 +200,21 @@ jobs:
##

- name: Wasm funniness
if: matrix.qt_arch == 'wasm_singlethread'
if: matrix.qt_arch == 'wasm_multithread'
shell: bash
run: |
cd ${{ env.BUILD_DIR }}
cp QFRCScouter.html index.html
- name: Upload Pages WASM
if: matrix.qt_arch == 'wasm_singlethread'
if: matrix.qt_arch == 'wasm_multithread'
uses: actions/[email protected]
with:
path: ${{ env.BUILD_DIR }}
retention-days: 14

- name: Deploy Pages WASM
if: matrix.qt_arch == 'wasm_singlethread'
if: matrix.qt_arch == 'wasm_multithread'
uses: actions/[email protected]

- name: Upload Release APK (Linux)
Expand Down
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,35 @@ The match number is next, which can be incremented and decremented with the plus

Finally, if the schedule is set up properly, the scouter can set the alliance station they plan to scout. The scouting app will automatically set the team number for each match. The selected station & team number will always be displayed at the bottom.

![TeamInfo](/img/TeamInfo.png?raw=true)

### Auto Data
Scouting for autonomous data begins. Press the plus and minus buttons on each of the relevant fields as needed, and select the checkboxes at the end of the autonomous period as needed.

![Auto](/img/Auto.png?raw=true)

### Teleop Data
Scouting for teleop & endgame data begins. Operation here is identical to Auto scouting.

![Tele](/img/Tele.png?raw=true)

### Notes
Enter any quick thoughts on the team you're scouting. You will be asked to quantify some things later, so don't go into too much detail.

![Notes](/img/Notes.png?raw=true)

### Opinions
Select your opinions on various factors here, ranging from very bad to elite. If the team didn't contribute in that factor, select N/A.

![Scales](/img/Scales.png?raw=true)

### QR Code
You're done! Present your QR code to the scanner to be put into the spreadsheet. Once done, select "next match". This will bring you to the beginning, and increment the match number, selecting the correct team for your alliance station.

If the scan failed and you already selected "next match", OR if you wish to change some data, press "Back to QR Code" on the first page.

![QRCode](/img/QRCode.png?raw=true)

## Self-Hosting

### Schedule
Expand Down
Binary file added img/Auto.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/Notes.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/QRCode.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/Scales.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/Tele.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 9c29092

Please sign in to comment.