Commit graph

163 commits

Author SHA1 Message Date
bf29eff1b0
Fix median calculation algorithm (hopefully) 2023-05-26 10:24:48 -04:00
f9aa9ec8e4
Complete text-only output 2023-05-17 14:42:19 -04:00
2952d21bda
logback level requires quotes 2023-05-17 11:16:13 -04:00
3f85ff89ca
Fix logging
Previous commit had logging compile, but would not run properly due to
improperly formatted log information in logback.xml This has been fixed.
2023-05-17 11:09:41 -04:00
42f226c05b
Change output to text-only 2023-05-17 10:56:29 -04:00
db115b3905
Compress OpenCV and Tesseract into a single file 2023-05-17 09:48:28 -04:00
0284371c91
Finish removing manual ErrorLogging 2023-05-17 08:57:12 -04:00
04f78bcebc
Start replacing ErrorLogging with logging library 2023-05-16 15:53:46 -04:00
1bb23393f4
Revert "v5.0.0 alpha build 1"
This reverts commit d045e9d72c.
2023-05-16 15:00:29 -04:00
412a8e0d4e
Revert "Merge branch 'devel' of github:blizzardfinnegan/javaOCR into devel"
This reverts commit 5b38fc89d6, reversing
changes made to d045e9d72c.
2023-05-16 14:42:11 -04:00
59c89dec18
Revert "Remove excess dependencies, ensure project builds"
This reverts commit a809d2d70d.
2023-05-16 14:40:56 -04:00
b7ba4453a3
Revert "Replace internal logging with SLF4J"
This reverts commit e1f3c33291.
2023-05-16 14:40:54 -04:00
a0eeeb75a0
Revert "Tweak logging calls"
This reverts commit cc42109f33.
2023-05-16 14:40:45 -04:00
cc42109f33
Tweak logging calls 2023-04-04 14:51:36 -04:00
e1f3c33291
Replace internal logging with SLF4J 2023-04-04 13:54:19 -04:00
a809d2d70d
Remove excess dependencies, ensure project builds 2023-04-03 15:48:40 -04:00
5b38fc89d6
Merge branch 'devel' of github:blizzardfinnegan/javaOCR into devel 2023-04-03 15:38:49 -04:00
d045e9d72c
v5.0.0 alpha build 1
- Refactor data saving to only save important information.
- Combine OpenCV and Tesseract into single file, ImageFacade.
- ConfigFacade updated to explicitly state image save locations.
- implement ImageFacade force save
- Modified output to be `.txt`, rather than `.xls`, for compatibility
- Minimised r/w operations to filesystem down to only necessary inputs
  (Sample images, bad images, text file containing serial, total
  iterations, pass iterations, std.dev, and median)
2023-04-03 15:26:13 -04:00
ee5307fb5a
Error handling improvements; Improved Cycle API
- Cycle values can be updated with MAP values.
- Now errors properly on invalid composite frame value
- Now errors properly if no active cameras when running runTests
2023-03-22 12:06:15 -04:00
f7e71e7163
Update documentation, improve readability of code
No functional changes have been made, new build not required
2023-03-21 09:54:42 -04:00
Blizzard Finnegan
24be910f7a
Merge pull request #19 from blizzardfinnegan/devel
Multithreading hotfix
2023-03-21 08:57:39 -04:00
ac90cd02ae
Multithreading hotfix
Write thread was prematurely exiting in previous build
2023-03-21 08:54:35 -04:00
Blizzard Finnegan
8be83fa479
Merge pull request #18 from blizzardfinnegan/devel
v4.3.9 push
2023-03-20 15:06:42 -04:00
0a95a68e61
Merge branch 'devel' of github:blizzardfinnegan/javaOCR into devel 2023-03-20 14:54:00 -04:00
e37f7b71f9
Threading overhaul + Updated datasaving
Data-saving at high cycle count takes too long, causing the DUT to fall
asleep. Data-saving has been extracted into its own thread.

Additionally, Run/pause switch has been re-threaded using synchronized
statements, rather than lock statements, making the run switch work
properly (finally).

Data is now saved in the new Cycle object, rather than passing around
multiple maps, hopefully improving memory footprint.
2023-03-20 14:45:04 -04:00
Blizzard Finnegan
18e51516bc
Create LICENSE
Signed-off-by: Blizzard Finnegan <49597944+blizzardfinnegan@users.noreply.github.com>
2023-03-16 14:26:22 -04:00
Blizzard Finnegan
55f97572a7
Create LICENSE
Signed-off-by: Blizzard Finnegan <49597944+blizzardfinnegan@users.noreply.github.com>
2023-03-16 14:25:47 -04:00
Blizzard Finnegan
52fe20fba5
Change generated Javadoc to public-only
Signed-off-by: Blizzard Finnegan <49597944+blizzardfinnegan@users.noreply.github.com>
2023-03-16 11:01:06 -04:00
Blizzard Finnegan
75db0b4c92
Merge pull request #17 from blizzardfinnegan/devel
v4.3.8 push
2023-03-16 09:56:17 -04:00
97bcb77e6c
Update movement algorithm
Movement algorithm now has an upper and lower bound, and warns user if
outside that bound.
Also, modified error logging to not post timestamp to user, for easier
readability.
Finally, muted extraneous logging messages from user.
2023-03-16 09:43:09 -04:00
e326eee89a
Finish removing infinite loop 2023-03-15 18:17:20 -04:00
8d95a9367d
Continue updating readme 2023-03-15 15:45:00 -04:00
341f6aa163
Update readme with platform flag, and reasoning 2023-03-15 11:59:38 -04:00
2820fb4f34
Update todolist 2023-03-15 11:14:08 -04:00
5796163068
Version bump
- Update all classes to more verbosely log what's going on.
- Update readme and udev rule for automatic camera checking
- Add dependency-checking plugin to pom.xml
- Add GPIO check on initialisation, and override to not drive GPIO if
  not plugged in
- Continue updating functions to be closer and more accurate to
  documentation
2023-03-15 11:10:09 -04:00
65eaec4035
Add dependency analysis 2023-03-14 14:03:19 -04:00
acf26c67a5
Finish updating of UML and stateflow
Going through documentation again, and ensuring that documentation is
accurate and up to date
2023-03-14 10:04:11 -04:00
fe624512e9
End of Day Mar. 13
Update documentation; make code and code understandable
2023-03-14 07:10:36 -04:00
5a799b4149
Remove extraneous "start of program" log call 2023-03-13 12:32:39 -04:00
2370971a89
Update writes to log file 2023-03-13 12:31:36 -04:00
e202de939e
Make tesseract output more verbose 2023-03-13 11:10:00 -04:00
Blizzard Finnegan
c0d335c992
Merge pull request #16 from blizzardfinnegan/devel
v4.3.7 merge
2023-03-13 10:20:22 -04:00
caed5f0d1e
Remove PWM code
Pi's PWM pin has been replaced with PWM-generating hardware. Motor
location-finding algorithm has been left in, to ensure safe travel.
2023-03-13 10:14:11 -04:00
9afbcfbf43
End of day 10 Mar. commit 2023-03-13 08:08:17 -04:00
Blizzard Finnegan
f7ff54a674
Merge pull request #15 from blizzardfinnegan/devel
v4.3.6 push
2023-03-10 12:21:03 -05:00
6b23c0e156
Fix minor glitch with DataSaving
Also expand buffer range on MovementFacade
2023-03-10 12:14:56 -05:00
429386c428
Remove old comments, change javadoc to public 2023-03-10 09:59:30 -05:00
Blizzard Finnegan
2ff959d8b4
Merge pull request #14 from blizzardfinnegan/devel
4.3.5 patch
2023-03-09 13:13:42 -05:00
1bab6887ba
Update documentation and todos 2023-03-09 13:12:30 -05:00
4deb0287c9
Last-second patches to ensure working code
- ConfigFacade now properly imports without overwriting old data
- DataSaving now doesn't fail and cause pre-emptive crashing
- DataSaving now creates pass % line outside of data lines for quick
  access
2023-03-09 13:06:21 -05:00