Commit graph

135 commits

Author SHA1 Message Date
bb67f03069
Add check for LO values 2023-02-17 14:09:35 -05:00
a5daaa7d03
Comment out debug save 2023-02-17 13:59:01 -05:00
ae5e69a9ef
increase delay between fixture movement and button 2023-02-17 09:49:43 -05:00
319ac93690
Fix eventual misreads, part 1 2023-02-17 09:47:35 -05:00
Blizzard Finnegan
dfca8d8b5a
Merge pull request #7 from blizzardfinnegan/devel
Output file fixes, version bump to 4.3.0
2023-02-15 10:06:51 -05:00
0f2bcdfc90
Update OpenCV to 4.6.0, misc fixes
- Update OpenCV to 4.6.0 (Bytedeco API v1.5.8)
- Remove extra debug image saves to minimise storage space used
- minor version bump
- update final formula in DataSaving to be correct
2023-02-15 09:41:43 -05:00
b460e572a7
Start code documentation 2023-02-13 16:16:03 -05:00
d13bce1521
Correct data-saving methodology
Edit data-saving methodology to include color-matching, and a final line
formula.
Also, minor version bump
2023-02-13 15:03:30 -05:00
0d789f7813
Start creating UML Diagram
Also, made import statements more explicit
2023-02-10 15:43:01 -05:00
Blizzard Finnegan
0d9cc55786
Merge pull request #6 from blizzardfinnegan/devel
Finish crop mods, fix config
2023-02-10 14:41:37 -05:00
14f0e278a1
Finish crop mods, fix config
Was accidentally saving all values twice, instead of just once. That's
been resolved.
2023-02-10 14:39:27 -05:00
Blizzard Finnegan
a3c8c59765
Merge pull request #5 from blizzardfinnegan/devel
Overhaul cropping
2023-02-10 10:33:07 -05:00
4d0b08fb7f
Update documentation 2023-02-10 10:31:26 -05:00
4fdab65dea
Rework cropping UX
Cropping is now done using OpenCV's region detection (selectROI).
This window currently crashes, but this does not effect overall runtime
of the package as a whole.

runScript updated to mute System.err messages, as they are handled
properly at this point in development.
2023-02-10 10:25:52 -05:00
Blizzard Finnegan
19d7eb2e1a
Merge pull request #4 from blizzardfinnegan/devel
Minor updates to improve ease of use
2023-02-09 15:50:25 -05:00
2e8d3e6239
Minor updates to improve ease of use
- UI now reports back more helpful information on current activities
- version bump affected files
2023-02-09 15:48:47 -05:00
5567de86ac
Finish 4.0.0, ready to ship
Start updating documentation as necessary on first-install and usage
2023-02-09 12:51:02 -05:00
498ae813f1
Finish 4.0.0 2023-02-08 15:39:09 -05:00
Blizzard Finnegan
8739a956f3
Merge pull request #3 from blizzardfinnegan/stable
merge-back
2023-02-08 09:35:13 -05:00
Blizzard Finnegan
d066cd8f4b
Merge pull request #2 from blizzardfinnegan/devel
4.0.0 pre-release push
2023-02-08 08:54:58 -05:00
Blizzard Finnegan
5930698d8c
Merge branch 'stable' into devel 2023-02-08 08:54:47 -05:00
ae79c0f95f
Remove GUI from current build for 4.0.0 ship 2023-02-08 08:49:58 -05:00
Blizzard Finnegan
4549804ad4
Update README.md 2023-02-07 10:22:05 -05:00
28f0786569
Attempt to single-line command 2023-02-07 10:20:06 -05:00
Blizzard Finnegan
2b5acc0c5f
Attempt 3 at fixing formatting 2023-02-07 10:16:25 -05:00
2b1ba465e1
Continue updating formatting of Readme 2023-02-07 10:13:54 -05:00
f008ebfcc5
Update formatting in first-time install section 2023-02-07 10:12:42 -05:00
ddfbf7e6c7
Update Readme to be in line with stable 2023-02-07 10:11:38 -05:00
db5b8c4b86
Finish* updating README 2023-02-07 09:59:51 -05:00
d30edcdceb
Update README with necessary instructions
Also, update pom.xml for easier switching between GUI and CLI
compilations.
2023-02-07 09:55:41 -05:00
fcd830e6ed
Continue updating GUI
Also added a run script, to be copied with the JAR file to the Pi being
imaged. (Stored in main git folder so that it can be version controlled
with the rest of the repo, and not get deleted by Maven on `mvn clean
package`)
2023-02-07 08:26:37 -05:00
33ddd6e20f
Finish documentation
POM temporarily modified to start with Cli, as it was necessary for
demonstration.
2023-02-06 12:36:38 -05:00
066aec9a74
Continue overhaul
- Found and resolved issue with random file organisation.
	This was a rather heavy undertaking, resulting in the changes to
	DataSaving, OpenCVFacade, and TesseractFacade. See API for
	specifics.
- Start debugging GUI.
	Start currently only runs one iteration, and does not save final
	information out. Start/Stop button needs refining, and user
	feedback needs to be improved.
2023-02-06 09:44:48 -05:00
c7b8e4186c
minor formatting update 2023-02-03 16:01:52 -05:00
c89a6f14b7
Merge local to remote stable 2023-02-03 16:00:33 -05:00
fb5198cc0f
Remove old comment in Readme 2023-02-03 15:58:46 -05:00
4a3313e326
Remove unnecessary dependency 2023-02-03 15:58:16 -05:00
Blizzard Finnegan
d436c79233
Merge pull request #1 from blizzardfinnegan/devel
4.0.0-rc2
2023-02-03 15:57:23 -05:00
5dada1d2d1
Finish CLI
Run switch interrupt still doesn't work, but I'm going to set that to
the side to make sure the GUI will also work properly.
2023-02-03 15:54:29 -05:00
cd98303f8d
End of day version bump, 02 Feb.
Forgot to do this yesterday.
2023-02-03 09:12:29 -05:00
d6224ef2cb
BROKEN - Misc. Bug Hunting
modified:   src/main/java/org/baxter/disco/ocr/Cli.java
	modified:   src/main/java/org/baxter/disco/ocr/ConfigFacade.java
	modified:   src/main/java/org/baxter/disco/ocr/DataSaving.java
	deleted:    src/main/java/org/baxter/disco/ocr/Gui.java
	modified:   src/main/java/org/baxter/disco/ocr/MovementFacade.java
	modified:   src/main/java/org/baxter/disco/ocr/OpenCVFacade.java
2023-02-02 15:00:11 -05:00
b0593d1ede
INCOMPLETE - Overhaul GUI
I never actually started building based on MVC, so this has started to
rebuild accordingly.
2023-02-01 16:21:37 -05:00
b7d185d910
UNTESTED - Complete GUI setup
Now, to test if things work properly.
2023-02-01 09:18:08 -05:00
74bafcf6d1
INCOMPLETE - End of day 30 Jan. 2023
Started adding user-modifiable threshold value, GUI almost done
2023-01-30 16:20:45 -05:00
9411e0aa5e
Start rewriting GUI
Turns out, packaging JavaFXML into a FatJAR is essentially impossible.
Ah well, time to do things the old-fashioned way...
2023-01-30 13:14:07 -05:00
Blizzard Finnegan
e7899612bc
Add Maven Github auto-build 2023-01-27 16:07:29 -05:00
7f5111cd22
TESTED - IT RUNS!!!
Need to do some advanced input parsing, and fix some timing issues, but
other than that, it should be set to build in the GUI now.

Branching here to work on 4.0.0-rc2; this branch will now be complete
builds.
2023-01-27 15:56:37 -05:00
f78b8c5b94
Test gpg-key connection 2023-01-27 12:29:04 -05:00
dbcf74bc55 Removal of gamma code; update version numbers
The ArduCam IMX219, despite the documentation, does not have
user-modifiable gamma values. As such, gamma modification has been
removed, and replaced with a modified threshold point. This will be
documented, and eventually made user-modifiable.
2023-01-27 12:26:38 -05:00
00d5d53ae1
BROKEN - Continued output debugging... 2023-01-27 10:38:31 -05:00