Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Detector, BinaryPattern & LED class #43

Merged
merged 58 commits into from
Oct 5, 2017
Merged

Detector, BinaryPattern & LED class #43

merged 58 commits into from
Oct 5, 2017

Conversation

brainmachine
Copy link
Collaborator

No description provided.

@brainmachine
using camera dimensions to set drawing regions
c2eb83d
@brainmachine
setter for ledBrightness
31b368b
@brainmachine
simple test animation (red | green | blue)
7c16f67
@brainmachine
added BinaryPattern class files manually (branch was too far from dev…
cf53ebd 
…elop, pretty much ummergable)
@brainmachine
flashing single binary pattern on all LEDs. only HIGH and LOW signals.
e0a7a9e
@brainmachine
better binary pattern, missing OFF between START and first bit
b34a60e
@brainmachine
binary pattern with OFF inserts working
89d036a
@brainmachine
binary pattern for a single LED
1244801
@brainmachine
drawing contour label
557c023
@brainmachine
contour persistance
d090080
@brainmachine
printing average coor values in contour
5c2ae32
@brainmachine
binary stuff
2baa527
@brainmachine
getting highest average color per frame (single contour)
ad750e7
@brainmachine
case statement checking for detected colours. successfully detecting …
fce5c4e 
…all four states (start, low, high, off).
@brainmachine
added Tracker class files
ecd60e5
@brainmachine
Tracker class subclasses contour finder. refactored contourFinder use…
cf2bb69 
… in ofApp
@brainmachine
hasFoundFirstContour bool now part of Tracker class
00c522c
@brainmachine
animator now has a pointer to opcClient that it can operate on intern…
1cc3e03 
…ally.
@brainmachine
Animator class talks to opcClient
492c37d
@brainmachine
changed OPC class and calling it accordingly
414d9ee
@brainmachine
Animator setNumLedsPerStrip also updates OPC Client numLedsPerStrip
2bc513c
@brainmachine
tracker refactoring
e74b2e0
@brainmachine
thresholded view drawing but parameters not updating
ab1257b
@brainmachine
tracker modes and conditional updating
1eb878a
@brainmachine
sequential tracking drawing properly, detecting first LED is broken
abd9209
@brainmachine
fixed first LED tracking
db54392
@brainmachine
fixed header guards
8525d9e
@brainmachine
changed led_state_t to pattern_state_t
5450fa0
@brainmachine
renaming variables for clarity, tracker
1bed976
@brainmachine
...
9fcc561
brainmachine and others added 28 commits September 28, 2017 11:18
@brainmachine
separating binaryPattern and animationPattern, string and vector
c7ec0c6
@brainmachine
decoding signal + testing
16c779b
@brainmachine
fixed brightness averaging
224e0b0
@brainmachine
no major changes, but the sunlight reduces the contrast between colou…
8676299 
…rs (especially green and blue), making detection difficult.
@brainmachine
decoded the binary pattern successfully for the first time! (confirme…
43f5c3d 
…d via log, no actualy matching yet)
@brainmachine
matching a single pattern in ofApp. comparing Animator pattern and Tr…
e07545e 
…acker detectedPattern
@brainmachine
setNumStrips breaks things
0cf8d1d
@brainmachine
matching multiple patterns. this might work.
415ac99
@brainmachine
working with a limited number of LEDs, created LED class
3391226
@brainmachine
binaryPattern class -> animationPatternLength cannot be const int
495c910
@brainmachine
refactored animator to use LED class instead of ofColors vector (pixels)
97a665c
@brainmachine
animator refactoring, drawing detected binary string next to tracker …
eab4568 
…rect
@brainmachine
renamed tracker class and everything associated
8e28624
@brainmachine
comment
fa6057d
@brainmachine
commented out most runtime cout statements for binary pattern detection
be57538
@brainmachine
merging GUI, detector camera broken
666a6f6
@brainmachine
thresholded works with cam[0] hardcoded
edba6b8
@brainmachine
changes to camera type in detector class, calling detector.setup() ag…
65f2204 
…ain when switching
@brainmachine
animator frameskip
a77d9b4
@brainmachine
detector.updateViewOnly() updates and draws thew thresholded view wit…
9e3b058 
…hout doing any detections
@brainmachine
animator settings
b5aba89
@brainmachine
disabled animator frameSkip for now, it was breaking sequential tracking
7a6eb1b
@brainmachine
preventing crash on detectedPatterns out of bounds
0564476
@timrolls
added off animation mode
65fcf9d
@timrolls
Merge branch 'tracker' of https://github.com/brainmachine/Lightwork-M…
5d93630 
…apper into animator
@brainmachine
DETECTOR_MODE_OFF
fae7821
@timrolls
toggle for testing mode
12c951e
@brainmachine
last tweaks before release
4c7ce0a
@brainmachine brainmachine merged commit 186c88c into PWRFLcreative:develop Oct 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@brainmachine @timrolls