Commit graph

166 commits

Author SHA1 Message Date
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
e41fb1419c BROKEN! - Possible misread of thesh./crop
Toggling threshold changes whether the image is cropped...
2023-01-27 08:54:04 -05:00
44e168b733
End of day commit, 26 Jan 2023-01-27 08:02:11 -05:00
3b892efb7e
TESTED - Image processing improvements.
Image is now being cropped and gamma adjusted properly. Threshold does
not seem to be applying though... will have to look further.

Also, moved default values from ConfigFacade to ConfigProperties,
because that made more sense.

Fixture now moves properly as part of configuration, to ensure a good
preview image.
2023-01-26 14:14:28 -05:00
1299d38ba3
TESTED - Image processing needs work.
Image is successfully collected, but image processing doesn't appear to
actually be doing anything... Starting debug process.
2023-01-26 10:37:42 -05:00
2f81a51e4b
TESTED - We have image!!!
Image from camera successfully created, processed*, and saved. Image
processing specifics have yet to be tested.
2023-01-26 10:01:18 -05:00
033852adc6
UNTESTED!!! End of day push 25 Jan.
Major rework of OpenCV, Config, ErrorLogging, and CLI.

Major changes:
- Started debug of image processing. (Currently still nonfunctional)
- Added a PrintWriter.flush() call to ErrorLogging, to force errors to
  be written to log file.
- Cli.main now will always close GPIO and Logs.
- Config properties now have safe names for config files.
- Started removal of null.equals(null) calls, which result in
  NullExceptionErrors. (These have not all been confidently caught.)
2023-01-25 17:07:47 -05:00
0304bc5e2a
BROKEN !!! - Continued debug of configureCameras 2023-01-25 11:29:36 -05:00
47591861ac Complete removal of target folder 2023-01-25 09:04:17 -05:00
b29660bc7b
End of day 24 Jan. 2024 2023-01-24 16:03:58 -05:00
294716f236
BROKEN!!! Start fixing ConfigFacade
OpenCV has been fixed, but initialisation of config variables needs to
be fixed.
2023-01-24 15:28:15 -05:00
242a9676ca
BROKEN!!! Start connecting CLI to OpenCV
Currently throws NullPointerException on camera creation.
2023-01-24 14:15:49 -05:00
69aca32ba5
Update CLI with more robust user input filtering.
Also start adding version numbers.
2023-01-24 11:58:23 -05:00
9819ea5252
Finish initial development of MovementFacade
Implement MovementFacade into CLI; set default file location for
ErrorLogging.
2023-01-24 10:48:23 -05:00
6d9a1d55f7
End of 23 Jan. commit 2023-01-23 16:08:38 -05:00
a7dcf32004
Start updating Javadocs 2023-01-23 11:25:09 -05:00
a5d62e35e9
Start DataSaving work.
Basic framework implemented; going back to logging_tools.py to get
additional information on what was written.
2023-01-23 10:40:50 -05:00
f585080741
Finish basic CLI backbone
Need to interface with outside classes now.
2023-01-23 09:37:45 -05:00
77f6777ea9
end of week commit 2023-01-20 16:14:32 -05:00
d666085f49
End of week 3 commit 2023-01-20 16:12:33 -05:00