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

Controller integration #125

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open

Controller integration #125

wants to merge 25 commits into from

Commits on Jul 5, 2016

  1. Refactored to pull common code into OSVRTrackedDevice base class.

    @godbyk
    godbyk committed Jul 5, 2016
    Configuration menu
    Copy the full SHA
    1ced330 View commit details
    Browse the repository at this point in the history

  2. Removed obsolete code.

    @godbyk
    godbyk committed Jul 5, 2016
    Configuration menu
    Copy the full SHA
    a4fc526 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2016

  1. Initial import of controller support.

    @godbyk
    godbyk committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    5a4a62f View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2017

  1. Merged controller with master in preperation for integration work.

    @Conzar
    Conzar committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    6ed2bfa View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2017

  1. Initial Commit - merged and updated so that it compiles.

    @Conzar
    Conzar committed Jul 7, 2017
    Configuration menu
    Copy the full SHA
    61332c8 View commit details
    Browse the repository at this point in the history

  2. Ignoring cmake

    @Conzar
    Conzar committed Jul 7, 2017
    Configuration menu
    Copy the full SHA
    1e110c1 View commit details
    Browse the repository at this point in the history

  3. Working on integration.

    @Conzar
    Conzar committed Jul 7, 2017
    Configuration menu
    Copy the full SHA
    5dfd217 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2017

  1. Working on developing.

    @Conzar
    Conzar committed Jul 10, 2017
    Configuration menu
    Copy the full SHA
    814097f View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2017

  1. Added print statement on deactivate.

    @Conzar
    Conzar committed Jul 17, 2017
    Configuration menu
    Copy the full SHA
    0565ef5 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2017

  1. Working with Kevin on fixing problems with constructor 

    to get steamvr to recognize the controllers.
    @Conzar
    Conzar committed Aug 3, 2017
    Configuration menu
    Copy the full SHA
    f72ba13 View commit details
    Browse the repository at this point in the history

  2. Added back openvr submodule and cleaned up for latest version.

    @Conzar
    Conzar committed Aug 3, 2017
    Configuration menu
    Copy the full SHA
    9b1e0b6 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2017

  1. Still lots of comments and needs to be cleaned up. 

    But, controller buttons are sorted.  I don't think the axis is correct
on the trackpad though.  There is also a Button_A that I wasn't sure
what to map to.
    @Conzar
    Conzar committed Aug 7, 2017
    Configuration menu
    Copy the full SHA
    124fd8e View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2017

  1. Added touch press and unpress for trackpad!

    @Conzar
    Conzar committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    16564da View commit details
    Browse the repository at this point in the history

  2. Fixed trigger!

    @Conzar
    Conzar committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    80fca11 View commit details
    Browse the repository at this point in the history

  3. Added battery interaction.

    @Conzar
    Conzar committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    ad059b4 View commit details
    Browse the repository at this point in the history

  4. Fixed the battery status.

    @Conzar
    Conzar committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    c1be95c View commit details
    Browse the repository at this point in the history

  5. Cleaned up, readying for PR.

    @Conzar
    Conzar committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    c78f592 View commit details
    Browse the repository at this point in the history

  6. Removed comments.

    @Conzar
    Conzar committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    da14a85 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2017

  1. changed openvr path back.

    @Conzar
    Conzar committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    bd45e00 View commit details
    Browse the repository at this point in the history

  2. Using enum to differentiate between left and right controller.

    @Conzar
    Conzar committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    0e1eb86 View commit details
    Browse the repository at this point in the history

  3. Removed unnecessary log entry.

    @Conzar
    Conzar committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    4f46a40 View commit details
    Browse the repository at this point in the history

  4. Added back in commented out (due to version mismatch).

    @Conzar
    Conzar committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    61c5bba View commit details
    Browse the repository at this point in the history

  5. Removed unused function.

    @Conzar
    Conzar committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    62fd7b7 View commit details
    Browse the repository at this point in the history

  6. String optimization

    @Conzar
    Conzar committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    2cd70f4 View commit details
    Browse the repository at this point in the history

  7. Added error checking for array bounds.

    @Conzar
    Conzar committed Aug 11, 2017
    Configuration menu
    Copy the full SHA
    3e3b4b4 View commit details
    Browse the repository at this point in the history