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
Blizzard Finnegan
74b0f16864
Merge pull request #13 from blizzardfinnegan/devel
...
v. 4.3.5 Update
2023-03-08 15:36:35 -05:00
df85060d87
Minor fixes to mvmt code, remove test from CLI
2023-03-08 15:33:01 -05:00
f22d9f7b8d
Hide debug info, uncomment main menu
2023-03-08 15:22:43 -05:00
1ef2fecb57
Finalise automated motor control
2023-03-08 14:32:59 -05:00
dae70b168f
Add gotolimit check to stop motor preemptively
2023-03-08 08:59:41 -05:00
3167df3192
End of day 07 Mar. commit
...
CLI is now back to normal, updated DataSaving to be better.
Logging now stores camera names.
2023-03-07 15:41:10 -05:00
7708d1359a
Update docs, rollback accidental version increment
...
ErrorLogging now has consistent indentation
MovementFacade needs to be rolled back
2023-03-07 13:58:45 -05:00
b2b05c50df
End of day 06 Mar. commit
...
Remove speed from equation, attempt to debug calibration.
This is the last shot at calibration. If the solution can't be found
by 10am tomorrow, we revert to the old code.
2023-03-06 16:06:29 -05:00
cd0be06a9f
Remove hardcoded camera locations
...
also:
- Temporarily comment out CLI menu to make movement testing faster
- remove movement from config
2023-03-06 15:08:57 -05:00
fb79023fd4
End of day Mar. 3 commit
...
Motor calibration set up properly.
Started removing extra option from main menu.
`gotoLimit` potentially broken due to bad values in `VEL_STEP_1` and
`VEL_STEP_2`. Need to look further into these values.
ConfigFacade currently broken, due to previously-attempted saving of
fixture config values to config file. Needs to be rectified.
2023-03-03 15:54:40 -05:00
20a4b8a81a
End of Mar. 2 commit
...
Finally got more information on how the motor for the fixture works.
Started writing automation for motor control mechanisms.
2023-03-02 15:51:42 -05:00
31cba9e0e9
UNTESTED : Fix gotoLimit error
...
Timeout override now works properly
2023-03-01 16:02:24 -05:00
19977655c4
End of Mar. 1 commit
...
- Start adding motor protections
- add motor config variables to config file
- remove magic numbers in TesseractFacade
2023-03-01 15:55:34 -05:00
Blizzard Finnegan
1feb66674d
Merge pull request #12 from blizzardfinnegan/devel
...
v 4.3.4
2023-02-28 11:30:05 -05:00
d705a99011
Add explanation in function comments
2023-02-28 11:29:02 -05:00
7b38d83366
Add better motor movement safety
...
Motor now moves faster, but slows down when more than halfway through
timeout, so that limit switches aren't pushed as hard.
2023-02-28 11:26:54 -05:00
99569154e9
Add extended user info to Tesseract parsing
2023-02-24 16:16:50 -05:00
Blizzard Finnegan
798884102c
Merge pull request #11 from blizzardfinnegan/devel
...
4.3.3 patch
2023-02-24 12:59:26 -05:00
a965283b47
Fix endless loop, save image directly into excel
...
Images are now also PNG to reduce storage space
2023-02-24 12:55:10 -05:00
