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

Commits on Sep 19, 2017

  1. using camera dimensions to set drawing regions

    @brainmachine
    brainmachine committed Sep 19, 2017
    Configuration menu
    Copy the full SHA
    c2eb83d View commit details
    Browse the repository at this point in the history

  2. setter for ledBrightness

    @brainmachine
    brainmachine committed Sep 19, 2017
    Configuration menu
    Copy the full SHA
    31b368b View commit details
    Browse the repository at this point in the history

  3. simple test animation (red | green | blue)

    @brainmachine
    brainmachine committed Sep 19, 2017
    Configuration menu
    Copy the full SHA
    7c16f67 View commit details
    Browse the repository at this point in the history

  4. added BinaryPattern class files manually (branch was too far from dev… 

    …elop, pretty much ummergable)
    @brainmachine
    brainmachine committed Sep 19, 2017
    Configuration menu
    Copy the full SHA
    cf53ebd View commit details
    Browse the repository at this point in the history

  5. flashing single binary pattern on all LEDs. only HIGH and LOW signals.

    @brainmachine
    brainmachine committed Sep 19, 2017
    Configuration menu
    Copy the full SHA
    e0a7a9e View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2017

  1. better binary pattern, missing OFF between START and first bit

    @brainmachine
    brainmachine committed Sep 20, 2017
    Configuration menu
    Copy the full SHA
    b34a60e View commit details
    Browse the repository at this point in the history

  2. binary pattern with OFF inserts working

    @brainmachine
    brainmachine committed Sep 20, 2017
    Configuration menu
    Copy the full SHA
    89d036a View commit details
    Browse the repository at this point in the history

  3. binary pattern for a single LED

    @brainmachine
    brainmachine committed Sep 20, 2017
    Configuration menu
    Copy the full SHA
    1244801 View commit details
    Browse the repository at this point in the history

  4. drawing contour label

    @brainmachine
    brainmachine committed Sep 20, 2017
    Configuration menu
    Copy the full SHA
    557c023 View commit details
    Browse the repository at this point in the history

  5. contour persistance

    @brainmachine
    brainmachine committed Sep 20, 2017
    Configuration menu
    Copy the full SHA
    d090080 View commit details
    Browse the repository at this point in the history

  6. printing average coor values in contour

    @brainmachine
    brainmachine committed Sep 20, 2017
    Configuration menu
    Copy the full SHA
    5c2ae32 View commit details
    Browse the repository at this point in the history

  7. binary stuff

    @brainmachine
    brainmachine committed Sep 20, 2017
    Configuration menu
    Copy the full SHA
    2baa527 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2017

  1. getting highest average color per frame (single contour)

    @brainmachine
    brainmachine committed Sep 22, 2017
    Configuration menu
    Copy the full SHA
    ad750e7 View commit details
    Browse the repository at this point in the history

  2. case statement checking for detected colours. successfully detecting … 

    …all four states (start, low, high, off).
    @brainmachine
    brainmachine committed Sep 22, 2017
    Configuration menu
    Copy the full SHA
    fce5c4e View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2017

  1. added Tracker class files

    @brainmachine
    brainmachine committed Sep 26, 2017
    Configuration menu
    Copy the full SHA
    ecd60e5 View commit details
    Browse the repository at this point in the history

  2. Tracker class subclasses contour finder. refactored contourFinder use… 

    … in ofApp
    @brainmachine
    brainmachine committed Sep 26, 2017
    Configuration menu
    Copy the full SHA
    cf2bb69 View commit details
    Browse the repository at this point in the history

  3. hasFoundFirstContour bool now part of Tracker class

    @brainmachine
    brainmachine committed Sep 26, 2017
    Configuration menu
    Copy the full SHA
    00c522c View commit details
    Browse the repository at this point in the history

  4. animator now has a pointer to opcClient that it can operate on intern… 

    …ally.
    @brainmachine
    brainmachine committed Sep 26, 2017
    Configuration menu
    Copy the full SHA
    1cc3e03 View commit details
    Browse the repository at this point in the history

  5. Animator class talks to opcClient

    @brainmachine
    brainmachine committed Sep 26, 2017
    Configuration menu
    Copy the full SHA
    492c37d View commit details
    Browse the repository at this point in the history

  6. changed OPC class and calling it accordingly

    @brainmachine
    brainmachine committed Sep 26, 2017
    Configuration menu
    Copy the full SHA
    414d9ee View commit details
    Browse the repository at this point in the history

  7. Animator setNumLedsPerStrip also updates OPC Client numLedsPerStrip

    @brainmachine
    brainmachine committed Sep 26, 2017
    Configuration menu
    Copy the full SHA
    2bc513c View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2017

  1. tracker refactoring

    @brainmachine
    brainmachine committed Sep 27, 2017
    Configuration menu
    Copy the full SHA
    e74b2e0 View commit details
    Browse the repository at this point in the history

  2. thresholded view drawing but parameters not updating

    @brainmachine
    brainmachine committed Sep 27, 2017
    Configuration menu
    Copy the full SHA
    ab1257b View commit details
    Browse the repository at this point in the history

  3. tracker modes and conditional updating

    @brainmachine
    brainmachine committed Sep 27, 2017
    Configuration menu
    Copy the full SHA
    1eb878a View commit details
    Browse the repository at this point in the history

  4. sequential tracking drawing properly, detecting first LED is broken

    @brainmachine
    brainmachine committed Sep 27, 2017
    Configuration menu
    Copy the full SHA
    abd9209 View commit details
    Browse the repository at this point in the history

  5. fixed first LED tracking

    @brainmachine
    brainmachine committed Sep 27, 2017
    Configuration menu
    Copy the full SHA
    db54392 View commit details
    Browse the repository at this point in the history

  6. fixed header guards

    @brainmachine
    brainmachine committed Sep 27, 2017
    Configuration menu
    Copy the full SHA
    8525d9e View commit details
    Browse the repository at this point in the history

  7. changed led_state_t to pattern_state_t

    @brainmachine
    brainmachine committed Sep 27, 2017
    Configuration menu
    Copy the full SHA
    5450fa0 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2017

  1. renaming variables for clarity, tracker

    @brainmachine
    brainmachine committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    1bed976 View commit details
    Browse the repository at this point in the history

  2. ...

    @brainmachine
    brainmachine committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    9fcc561 View commit details
    Browse the repository at this point in the history

  3. separating binaryPattern and animationPattern, string and vector

    @brainmachine
    brainmachine committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    c7ec0c6 View commit details
    Browse the repository at this point in the history

  4. decoding signal + testing

    @brainmachine
    brainmachine committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    16c779b View commit details
    Browse the repository at this point in the history

  5. fixed brightness averaging

    @brainmachine
    brainmachine committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    224e0b0 View commit details
    Browse the repository at this point in the history

  6. no major changes, but the sunlight reduces the contrast between colou… 

    …rs (especially green and blue), making detection difficult.
    @brainmachine
    brainmachine committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    8676299 View commit details
    Browse the repository at this point in the history

  7. decoded the binary pattern successfully for the first time! (confirme… 

    …d via log, no actualy matching yet)
    @brainmachine
    brainmachine committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    43f5c3d View commit details
    Browse the repository at this point in the history

  8. matching a single pattern in ofApp. comparing Animator pattern and Tr… 

    …acker detectedPattern
    @brainmachine
    brainmachine committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    e07545e View commit details
    Browse the repository at this point in the history

  9. setNumStrips breaks things

    @brainmachine
    brainmachine committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    0cf8d1d View commit details
    Browse the repository at this point in the history

  10. matching multiple patterns. this might work.

    @brainmachine
    brainmachine committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    415ac99 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2017

  1. working with a limited number of LEDs, created LED class

    @brainmachine
    brainmachine committed Oct 3, 2017
    Configuration menu
    Copy the full SHA
    3391226 View commit details
    Browse the repository at this point in the history

  2. binaryPattern class -> animationPatternLength cannot be const int

    @brainmachine
    brainmachine committed Oct 3, 2017
    Configuration menu
    Copy the full SHA
    495c910 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2017

  1. refactored animator to use LED class instead of ofColors vector (pixels)

    @brainmachine
    brainmachine committed Oct 4, 2017
    Configuration menu
    Copy the full SHA
    97a665c View commit details
    Browse the repository at this point in the history

  2. animator refactoring, drawing detected binary string next to tracker … 

    …rect
    @brainmachine
    brainmachine committed Oct 4, 2017
    Configuration menu
    Copy the full SHA
    eab4568 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2017

  1. renamed tracker class and everything associated

    @brainmachine
    brainmachine committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    8e28624 View commit details
    Browse the repository at this point in the history

  2. comment

    @brainmachine
    brainmachine committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    fa6057d View commit details
    Browse the repository at this point in the history

  3. commented out most runtime cout statements for binary pattern detection

    @brainmachine
    brainmachine committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    be57538 View commit details
    Browse the repository at this point in the history

  4. merging GUI, detector camera broken

    @brainmachine
    brainmachine committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    666a6f6 View commit details
    Browse the repository at this point in the history

  5. thresholded works with cam[0] hardcoded

    @brainmachine
    brainmachine committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    edba6b8 View commit details
    Browse the repository at this point in the history

  6. changes to camera type in detector class, calling detector.setup() ag… 

    …ain when switching
    @brainmachine
    brainmachine committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    65f2204 View commit details
    Browse the repository at this point in the history

  7. animator frameskip

    @brainmachine
    brainmachine committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    a77d9b4 View commit details
    Browse the repository at this point in the history

  8. detector.updateViewOnly() updates and draws thew thresholded view wit… 

    …hout doing any detections
    @brainmachine
    brainmachine committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    9e3b058 View commit details
    Browse the repository at this point in the history

  9. animator settings

    @brainmachine
    brainmachine committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    b5aba89 View commit details
    Browse the repository at this point in the history

  10. disabled animator frameSkip for now, it was breaking sequential tracking

    @brainmachine
    brainmachine committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    7a6eb1b View commit details
    Browse the repository at this point in the history

  11. preventing crash on detectedPatterns out of bounds

    @brainmachine
    brainmachine committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    0564476 View commit details
    Browse the repository at this point in the history

  12. added off animation mode

    @timrolls
    timrolls committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    65fcf9d View commit details
    Browse the repository at this point in the history

  13. Merge branch 'tracker' of https://github.com/brainmachine/Lightwork-M… 

    …apper into animator
    @timrolls
    timrolls committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    5d93630 View commit details
    Browse the repository at this point in the history

  14. DETECTOR_MODE_OFF

    @brainmachine
    brainmachine committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    fae7821 View commit details
    Browse the repository at this point in the history

  15. toggle for testing mode

    @timrolls
    timrolls committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    12c951e View commit details
    Browse the repository at this point in the history

  16. last tweaks before release

    @brainmachine
    brainmachine committed Oct 5, 2017
    Configuration menu
    Copy the full SHA
    4c7ce0a View commit details
    Browse the repository at this point in the history