Commit graph

166 commits

Author SHA1 Message Date
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
2a9d7722af
Merge branch 'stable' into gui 2023-02-28 11:30:58 -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
58a1c1a360
Merge branch 'stable' into gui 2023-02-24 13:00:25 -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
3c1260b648
Script version bump 2023-02-21 08:47:42 -05:00
def7a6b50a
start removing unnecessary delays 2023-02-20 08:56:25 -05:00
e95001ce25
Merge branch 'stable' into gui 2023-02-20 08:32:54 -05:00
Blizzard Finnegan
20d30cf948
Merge pull request #10 from blizzardfinnegan/devel
Fix erroneous data saving; version bump
2023-02-20 08:30:44 -05:00
9a314215b6
Fix erroneous data saving; version bump 2023-02-20 08:28:42 -05:00
1ee1348d63
Merge branch 'stable' into gui 2023-02-17 16:02:20 -05:00
Blizzard Finnegan
a7557b6dff
Merge pull request #9 from blizzardfinnegan/devel
Add re-wake device on forcing sleep
2023-02-17 16:01:20 -05:00
fc679e9d40
Add re-wake device on forcing sleep 2023-02-17 16:00:08 -05:00
0be18b3af8
Merge branch 'stable' into gui 2023-02-17 14:18:00 -05:00
Blizzard Finnegan
e65016cbdb
Merge pull request #8 from blizzardfinnegan/devel
Add protections for bad values
2023-02-17 14:16:49 -05:00
83bb09c17a
update gitignore 2023-02-17 14:14:22 -05:00
4bdcbb0eae
Version bump 2023-02-17 14:13:51 -05:00
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
af0ae959e8
Merge branch 'stable' into gui 2023-02-15 10:09:25 -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
2ed037e91a
Merge branch 'stable' into gui 2023-02-10 14:42:20 -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
cb38ac0b43
Merge branch 'stable' into gui 2023-02-10 10:33:59 -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
1b3258e580
Merge remote-tracking branch 'origin/stable' into gui 2023-02-09 15:54:04 -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
c9dc800a8d
Merge branch 'stable' into gui 2023-02-09 12:52:17 -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
a19a2dce0a
Merge branch 'stable' into gui 2023-02-08 15:42:28 -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
36926be30b
Add current state of Gui files 2023-02-08 08:57:13 -05:00