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

Allow camera streaming to select a device from a physical port via udev #688

Merged
merged 10 commits into from
Apr 27, 2024
Merged

Allow camera streaming to select a device from a physical port via udev #688

merged 10 commits into from
Apr 27, 2024

Conversation

qhdwight
Copy link
Collaborator

@qhdwight qhdwight commented Apr 15, 2024 •
edited
Loading

Allows cameras to be identified by their physical port using udev system paths

@qhdwight qhdwight changed the base branch from integration to embedded April 15, 2024 20:22
Base automatically changed from embedded to integration April 18, 2024 01:24
@qhdwight qhdwight force-pushed the integration branch 4 times, most recently from 30aea7d to 6d06b3f Compare April 18, 2024 03:12
@qhdwight qhdwight merged commit e45f806 into integration Apr 27, 2024
1 check failed
@qhdwight qhdwight deleted the camera-id branch April 27, 2024 18:25
qhdwight added a commit that referenced this pull request Apr 28, 2024
@qhdwight
Squashed commit of the following:
f4a9902 
commit b476237
Author: qhdwight <qhdwight@gmail.com>
Date:   Sat Apr 27 20:51:21 2024 -0400

    Better error msg

commit 0508b1b
Author: qhdwight <qhdwight@gmail.com>
Date:   Sat Apr 27 17:01:51 2024 -0400

    Oops

commit e45f806
Merge: 7dcfcc7 620179f
Author: Quintin <qhdwight@gmail.com>
Date:   Sat Apr 27 14:25:53 2024 -0400

    Merge pull request #688 from umrover/camera-id

    Allow camera streaming to select a device from a physical port via udev

commit 620179f
Author: qhdwight <qhdwight@gmail.com>
Date:   Sat Apr 27 14:22:25 2024 -0400

    FOrmat

commit 2cfb2b8
Author: qhdwight <qhdwight@gmail.com>
Date:   Sat Apr 27 14:21:36 2024 -0400

    Update launch file

commit c1ae562
Author: qhdwight <qhdwight@gmail.com>
Date:   Sat Apr 27 14:16:53 2024 -0400

    Reorder

commit 1c203f1
Merge: c295415 7dcfcc7
Author: qhdwight <qhdwight@gmail.com>
Date:   Sat Apr 27 14:16:19 2024 -0400

    Merge remote-tracking branch 'origin/integration' into camera-id

commit 7dcfcc7
Author: qhdwight <qhdwight@gmail.com>
Date:   Sat Apr 27 14:08:57 2024 -0400

    Format

commit 35e4a7e
Author: qhdwight <qhdwight@gmail.com>
Date:   Sat Apr 27 14:07:06 2024 -0400

    Add needed video conv

commit 09e3fd6
Author: qhdwight <qhdwight@gmail.com>
Date:   Sat Apr 27 13:51:49 2024 -0400

    Comments

commit 659fd47
Author: qhdwight <qhdwight@gmail.com>
Date:   Sat Apr 27 13:47:07 2024 -0400

    Zero tune latency, add to sim

commit 98975cf
Author: qhdwight <qhdwight@gmail.com>
Date:   Sat Apr 27 13:29:41 2024 -0400

    Refactor streaming

commit 0710cfa
Author: neuenfeldttj <tjneuenfeldt@gmail.com>
Date:   Wed Apr 24 18:51:33 2024 -0400

    fixed bearing

commit 0b85e5a
Merge: b6d181b 4c766ad
Author: neuenfeldttj <tjneuenfeldt@gmail.com>
Date:   Wed Apr 24 18:33:59 2024 -0400

    Merge branch 'integration' of github.com:umrover/mrover-ros into integration

commit b6d181b
Author: neuenfeldttj <tjneuenfeldt@gmail.com>
Date:   Wed Apr 24 18:33:47 2024 -0400

    added map stuff

commit 4c766ad
Author: nehakankanala <nehakan@umich.edu>
Date:   Wed Apr 24 18:16:58 2024 -0400

    added gps driver back in

commit ba1fd6a
Author: umroverPerception <umroverPerception@gmail.com>
Date:   Wed Apr 24 15:51:58 2024 -0400

    make changes for mast gimbal

commit b398733
Merge: 434d2e4 f2147db
Author: umroverPerception <umroverPerception@gmail.com>
Date:   Wed Apr 24 14:19:22 2024 -0400

    Merge remote-tracking branch 'origin/integration' into arm-practice

commit f2147db
Author: jnnanni <jnnanni@umich.edu>
Date:   Tue Apr 23 19:28:52 2024 -0400

    SA_z encoder in inches

commit 2514628
Author: qhdwight <qhdwight@gmail.com>
Date:   Tue Apr 23 00:02:32 2024 -0400

    Supress cuda warning

commit 434d2e4
Author: qhdwight <qhdwight@gmail.com>
Date:   Mon Apr 22 21:50:24 2024 -0400

    Add micro adjust for drive

commit 270509e
Merge: b93f574 546e355
Author: qhdwight <qhdwight@gmail.com>
Date:   Mon Apr 22 12:00:51 2024 -0400

    Merge remote-tracking branch 'origin/integration' into arm-practice

commit 546e355
Merge: c45919a 916db00
Author: neuenfeldttj <tjneuenfeldt@gmail.com>
Date:   Sun Apr 21 21:32:53 2024 -0400

    Merge branch 'integration' of github.com:umrover/mrover-ros into integration

commit c45919a
Author: neuenfeldttj <tjneuenfeldt@gmail.com>
Date:   Sun Apr 21 21:32:35 2024 -0400

    added zero sa_z

commit 916db00
Author: umroverPerception <umroverPerception@gmail.com>
Date:   Sun Apr 21 15:23:10 2024 -0400

    Fix compile

commit b93f574
Author: MRover Laptop <basestation@mrover.com>
Date:   Sun Apr 21 14:05:42 2024 -0400

    Tune pid

commit 2b7704a
Author: qhdwight <qhdwight@gmail.com>
Date:   Sun Apr 21 13:34:51 2024 -0400

    Set non finite variables to 0 for fk

commit 0beb164
Merge: 10130ea 06bf210
Author: qhdwight <qhdwight@gmail.com>
Date:   Sun Apr 21 12:13:19 2024 -0400

    Merge remote-tracking branch 'origin/integration' into arm-practice

commit 06bf210
Merge: 8bafb50 cceaa56
Author: neuenfeldttj <tjneuenfeldt@gmail.com>
Date:   Sun Apr 21 11:51:05 2024 -0400

    pulled integration, added SA position fix

commit cceaa56
Author: neuenfeldttj <tjneuenfeldt@gmail.com>
Date:   Sun Apr 21 11:39:52 2024 -0400

    fixed auton cameras

commit 10130ea
Author: qhdwight <qhdwight@gmail.com>
Date:   Sat Apr 20 18:56:03 2024 -0400

    Fix arm controls

commit e4e59a1
Author: umroverPerception <umroverPerception@gmail.com>
Date:   Sat Apr 20 18:55:37 2024 -0400

    Updates

commit 189b267
Author: qhdwight <qhdwight@gmail.com>
Date:   Sat Apr 20 17:29:43 2024 -0400

    Update

commit 671f071
Author: qhdwight <qhdwight@gmail.com>
Date:   Sat Apr 20 17:01:30 2024 -0400

    Temp fix

commit ddb39f4
Author: qhdwight <qhdwight@gmail.com>
Date:   Sat Apr 20 16:55:46 2024 -0400

    Add arm automation init

commit 3837e83
Merge: ac5fe3b 33d430c
Author: qhdwight <qhdwight@gmail.com>
Date:   Sat Apr 20 15:45:52 2024 -0400

    Merge remote-tracking branch 'origin/tjn/threejs_new' into arm-practice

commit ac5fe3b
Author: qhdwight <qhdwight@gmail.com>
Date:   Sat Apr 20 15:41:07 2024 -0400

    Fix catkin profile

commit c5174be
Author: qhdwight <qhdwight@gmail.com>
Date:   Sat Apr 20 15:35:11 2024 -0400

    Lower speed

commit 6e35754
Author: qhdwight <qhdwight@gmail.com>
Date:   Sat Apr 20 15:30:55 2024 -0400

    Avoid uneeded copy in usb camera, only replcae bits allocator if on gcc 13

commit c295415
Merge: d24a6ba 65c9dc9
Author: qhdwight <qhdwight@gmail.com>
Date:   Fri Apr 19 00:48:53 2024 -0400

    Merge remote-tracking branch 'origin/integration' into camera-id

commit d24a6ba
Merge: 40c8d43 5eb699e
Author: qhdwight <qhdwight@gmail.com>
Date:   Thu Apr 18 23:50:23 2024 -0400

    Merge remote-tracking branch 'origin/integration' into camera-id

commit 40c8d43
Merge: b272f5d 45dd19f
Author: qhdwight <qhdwight@gmail.com>
Date:   Thu Apr 18 23:47:30 2024 -0400

    Merge remote-tracking branch 'origin/integration' into camera-id

commit 33d430c
Author: qhdwight <qhdwight@gmail.com>
Date:   Thu Apr 18 15:37:53 2024 -0400

    Import

commit 9612ab7
Merge: b26ea44 90d365c
Author: qhdwight <qhdwight@gmail.com>
Date:   Thu Apr 18 14:31:18 2024 -0400

    Merge remote-tracking branch 'origin/integration' into tjn/threejs_new

commit b272f5d
Merge: e102663 4319cd6
Author: qhdwight <qhdwight@gmail.com>
Date:   Wed Apr 17 21:26:03 2024 -0400

    Merge remote-tracking branch 'origin/integration' into camera-id

commit b26ea44
Author: qhdwight <qhdwight@gmail.com>
Date:   Wed Apr 17 21:06:33 2024 -0400

    Fix arm base link

commit 3a9bcbe
Merge: 049d49b 1aaff35
Author: qhdwight <qhdwight@gmail.com>
Date:   Wed Apr 17 20:52:43 2024 -0400

    Merge remote-tracking branch 'origin/integration' into tjn/threejs_new

commit 049d49b
Author: qhdwight <qhdwight@gmail.com>
Date:   Wed Apr 17 14:35:23 2024 -0400

    Update

commit 2af6bef
Author: qhdwight <qhdwight@gmail.com>
Date:   Wed Apr 17 13:53:22 2024 -0400

    Format

commit 4c875e2
Merge: c89e6d5 cee42b1
Author: qhdwight <qhdwight@gmail.com>
Date:   Wed Apr 17 13:53:04 2024 -0400

    Merge remote-tracking branch 'origin/integration' into tjn/threejs_new

commit c89e6d5
Author: qhdwight <qhdwight@gmail.com>
Date:   Wed Apr 17 13:39:03 2024 -0400

    Update

commit 2841a0b
Merge: 5891cb1 ee9cbed
Author: qhdwight <qhdwight@gmail.com>
Date:   Wed Apr 17 11:42:48 2024 -0400

    Merge remote-tracking branch 'origin/integration' into tjn/threejs_new

commit 5891cb1
Author: neuenfeldttj <tjneuenfeldt@gmail.com>
Date:   Tue Apr 16 22:20:36 2024 -0400

    reorganized arm function

commit b75e258
Author: neuenfeldttj <tjneuenfeldt@gmail.com>
Date:   Tue Apr 16 11:35:57 2024 -0400

    fixed ik msg

commit e102663
Author: qhdwight <qhdwight@gmail.com>
Date:   Mon Apr 15 16:15:57 2024 -0400

    Add device resizing, rename some things

commit e222660
Author: qhdwight <qhdwight@gmail.com>
Date:   Sun Apr 14 15:12:05 2024 -0400

    Start working on camera stuff

commit 8bafb50
Author: neuenfeldttj <tjneuenfeldt@gmail.com>
Date:   Sun Apr 14 13:22:59 2024 -0400

    Fixed bug when gamepad is plugged in

commit da25ed1
Author: jnnanni <jnnanni@umich.edu>
Date:   Sun Apr 14 13:11:44 2024 -0400

    Fix sending arm positions

commit 59687e8
Merge: 8fcb4dc 268f19d
Author: neuenfeldttj <tjneuenfeldt@gmail.com>
Date:   Sat Apr 13 19:48:09 2024 -0400

    pulled integration, ik doesnt work

commit 8fcb4dc
Author: neuenfeldttj <tjneuenfeldt@gmail.com>
Date:   Sun Mar 17 16:49:07 2024 -0400

    fk and ik working

commit e4b4dac
Merge: fc979b2 695f830
Author: neuenfeldttj <tjneuenfeldt@gmail.com>
Date:   Sun Mar 17 14:13:13 2024 -0400

    Merge remote-tracking branch 'origin/integration' into tjn/threejs_new

commit fc979b2
Author: neuenfeldttj <tjneuenfeldt@gmail.com>
Date:   Sun Mar 17 14:11:17 2024 -0400

    Temp

commit 4445a32
Author: neuenfeldttj <tjneuenfeldt@gmail.com>
Date:   Sun Mar 10 13:39:05 2024 -0400

    fk works

commit 3bfc638
Author: neuenfeldttj <tjneuenfeldt@gmail.com>
Date:   Sun Feb 18 13:59:21 2024 -0500

    joint a translation works. de does not

commit 52166d7
Author: neuenfeldttj <tjneuenfeldt@gmail.com>
Date:   Sat Feb 17 22:02:07 2024 -0500

    fk works
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.
1 participant
@qhdwight