Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
ea054f7
Remove Tomee and Implement fresh Python GUI
connorgallopo Sep 10, 2025
93c9d04
Archive Dev Folder
connorgallopo Sep 10, 2025
e7c78a3
change camera startup order
connorgallopo Sep 10, 2025
6700c7c
Start cleaning up old docs
connorgallopo Sep 10, 2025
67af3fe
Log viewing
connorgallopo Sep 10, 2025
a593b99
Logs styling
connorgallopo Sep 10, 2025
f963f4b
pi detection
connorgallopo Sep 10, 2025
048b72e
add error display
connorgallopo Sep 10, 2025
eff905f
Logging for web server
connorgallopo Sep 10, 2025
2f455e0
deps + pi detect fix
connorgallopo Sep 10, 2025
6cf31dc
add fallbacks + more logging
connorgallopo Sep 10, 2025
901412a
Lint
connorgallopo Sep 10, 2025
b97d5bf
Lint + update tests
connorgallopo Sep 10, 2025
079e2ed
more linting
connorgallopo Sep 10, 2025
a7398f9
fix build issue
connorgallopo Sep 10, 2025
a064589
more md changes to fix build
connorgallopo Sep 10, 2025
0209cf4
more fixes
connorgallopo Sep 10, 2025
755abac
camera fix
connorgallopo Sep 10, 2025
67e2ab5
fix process detection
connorgallopo Sep 10, 2025
c7d37b9
fix function naming
connorgallopo Sep 10, 2025
04b5bde
fix type matching
connorgallopo Sep 10, 2025
03c4e6d
fix Cam1 Logs
connorgallopo Sep 10, 2025
e81917d
fix validations
connorgallopo Sep 10, 2025
9632c3e
more val fixes
connorgallopo Sep 10, 2025
a5cb89b
add cam slot
connorgallopo Sep 10, 2025
318cdec
add to payload
connorgallopo Sep 10, 2025
90b44f7
gain fix
connorgallopo Sep 10, 2025
9af20e1
updated parsers
connorgallopo Sep 11, 2025
001af74
change ipc result types
connorgallopo Sep 11, 2025
63df2e4
m7e4d is the goat
connorgallopo Sep 11, 2025
dec4a79
fix directory
connorgallopo Sep 11, 2025
204334a
tons of logging
connorgallopo Sep 11, 2025
1e56a91
handle image in payload
connorgallopo Sep 11, 2025
5e5692f
handle 7
connorgallopo Sep 11, 2025
0f281fc
refactor
connorgallopo Sep 11, 2025
d0e2958
Merge remote-tracking branch 'upstream/main' into feature/python-webs…
connorgallopo Sep 11, 2025
272af12
UI improvements
connorgallopo Sep 11, 2025
8cec8f5
More styling
connorgallopo Sep 11, 2025
f344d81
default potential fix
connorgallopo Sep 11, 2025
57163fc
AI model fixes
connorgallopo Sep 11, 2025
6a41dac
AI Fix Round 100000
connorgallopo Sep 11, 2025
f40ee1d
fix text content
connorgallopo Sep 11, 2025
7a3edfb
saving fix
connorgallopo Sep 11, 2025
b7f4554
remove bad default
connorgallopo Sep 11, 2025
0dd0f41
fixes
connorgallopo Sep 11, 2025
df36adf
race fixes
connorgallopo Sep 11, 2025
5830c03
fix duplicate rendering bug
connorgallopo Sep 11, 2025
175ebb7
duplication bug
connorgallopo Sep 11, 2025
13d835b
missing path fix
connorgallopo Sep 11, 2025
c7e0d01
Pass 1
connorgallopo Sep 12, 2025
c2791e7
fix log use
connorgallopo Sep 12, 2025
d20c955
fix api call
connorgallopo Sep 12, 2025
3c7eef8
change all settings view
connorgallopo Sep 12, 2025
141a5d9
Return all categories
connorgallopo Sep 12, 2025
ba99307
calibration
connorgallopo Sep 12, 2025
27ebc04
move css
connorgallopo Sep 12, 2025
26517fa
fix dark mode
connorgallopo Sep 12, 2025
89d3101
Better naming
connorgallopo Sep 12, 2025
96f60f2
Cam fix
connorgallopo Sep 12, 2025
54ab343
fix path bug
connorgallopo Sep 12, 2025
3711ece
fix empty params
connorgallopo Sep 12, 2025
4653979
testing tools
connorgallopo Sep 12, 2025
2f4ed4f
Logging changes and path for onnx
connorgallopo Sep 12, 2025
281c9ae
log config file
connorgallopo Sep 12, 2025
bfd7478
svg paste fix
connorgallopo Sep 12, 2025
b185dfc
templating html
connorgallopo Sep 12, 2025
6bafb43
HTML templating
connorgallopo Sep 12, 2025
491c3c0
JS fixes
connorgallopo Sep 12, 2025
86cc779
cleanup paths
connorgallopo Sep 12, 2025
3a0cc58
Code Cleanup
connorgallopo Sep 13, 2025
d8cd4ea
Fix conflicting naming
connorgallopo Sep 13, 2025
97eadec
new SVG
connorgallopo Sep 13, 2025
c0347b8
fix testing tool issue
connorgallopo Sep 13, 2025
8631fc6
fix logging in testing tools
connorgallopo Sep 13, 2025
0007fd2
more test cleanup
connorgallopo Sep 13, 2025
6f98f7a
run for limited time
connorgallopo Sep 13, 2025
26c336e
IP and GPIO Fixes
connorgallopo Sep 14, 2025
b1fa940
revert
connorgallopo Sep 14, 2025
46116b6
Python test implementation / fixes
connorgallopo Sep 15, 2025
1614587
speed up tests - fix hanging CI issue.
connorgallopo Sep 15, 2025
7c776d8
Startup Guide
connorgallopo Sep 15, 2025
2115f8e
Docs updates
connorgallopo Sep 15, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
# Top Level Software Ownership
/Software/ @jamespilgrim

# Java Ownership files
/Software/LMSourceCode/ImageProcessing/golfsim_tomee_webapp/ @jeshernandez
# Python Web Server
/Software/web-server/ @connorgallopo

# Yolo Model + Tooling
/Software/GroundTruthAnnotator/ @connorgallopo
Expand Down
42 changes: 0 additions & 42 deletions .github/workflows/java_build.yml

This file was deleted.

55 changes: 55 additions & 0 deletions .github/workflows/web-server-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Web Server Tests

on:
push:
paths:
- 'Software/web-server/**'
- '.github/workflows/web-server-tests.yml'
pull_request:
paths:
- 'Software/web-server/**'

jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.10', '3.11', '3.12']

steps:
- uses: actions/checkout@v3

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

- name: Cache pip packages
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements*.txt') }}
restore-keys: |
${{ runner.os }}-pip-

- name: Install dependencies
working-directory: Software/web-server
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
pip install -r requirements-test.txt

- name: Run tests with coverage
working-directory: Software/web-server
run: |
# Run tests in parallel using all available CPU cores
# -n auto automatically detects the number of CPUs
python -m pytest -n auto --tb=short --cov=. --cov-report=xml --cov-report=term --cov-fail-under=60

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
with:
file: Software/web-server/coverage.xml
flags: webserver
name: web-server-coverage
fail_ci_if_error: false
5 changes: 0 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,11 @@ HELP.md
out/
**/target/
!.mvn/wrapper/maven-wrapper.jar
*.war
!**/src/main/**/target/
!**/src/test/**/target/
.DS_Store
**/.DS_Store
# Package Files #
/Software/ImageProcessing/golfsim_tomee_webapp/target
/Software/ImageProcessing/golfsim_tomee_webapp/.codesight
**/LMSourceCode/ImageProcessing/golfsim_tomee_webapp/target
**/.war

### STS ###
.apt_generated
Expand Down
2 changes: 1 addition & 1 deletion Credits/CONTRIBUTORS AND ATTRIBUTION.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ The PiTrac team is grateful for everyone who has authored, supported, maintained
17. [Prusa MK4S](https://www.prusa3d.com/product/original-prusa-mk4s-3d-printer-kit/) and [PrusaSlicer](https://www.prusa3d.com/page/prusaslicer_424/)(3D Printer and Slicer)
18. [Raspberry Pi](https://www.raspberrypi.com/) Single-Board Computers
19. [Shedskin](https://shedskin.readthedocs.io/en/latest/index.html) (Certain colorsys elements)
20. [Tomee and other Apache products](https://tomee.apache.org/) (hosts the web-based interface)
20. [Python Flask](https://flask.palletsprojects.com/) (hosts the web-based interface)
21. [KiCad](https://www.kicad.org/) (Schematic and PCB software)

We are also thankful for individual contributors who—even if we haven’t used their code—have answered questions and who have spent a lot of their time making groups such as the Raspberry Pi community a smarter, better place. In particular,
Expand Down
22 changes: 0 additions & 22 deletions Dev/scripts/defaults/tomee.yaml

This file was deleted.

Loading