-
Notifications
You must be signed in to change notification settings - Fork 5k
Alderalke branch to development. #12060
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.
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
Merged
Merged
Changes from 2 commits
Commits
Show all changes
49 commits
Select commit
Hold shift + click to select a range
986096b
[ADL-P] LRS V4L2 Backend MPLANE streaming support [LRS-572]
21acbcb
PR #11295 from dmipx: [ADL-P] LRS V4L2 Backend MPLANE streaming suppo…
Nir-Az 68d5f5e
color processing block acc to platform
remibettan 4084c7c
using gev_dev_capabilities method
remibettan abd95d8
cr
remibettan a416a09
PR #11294 from remibettan: color processing block acc to platform
Nir-Az 3cb1dd9
Enumerate video nodes by name
3e6b496
Following code review.
996d7b6
PR #11319 from dmipx: Enumerate video nodes by name
Nir-Az f00007b
merge development
Nir-Az ed4e624
PR #11435 from Nir-Az: Align ADL-P to Development
Nir-Az 38dfbbf
Merge remote-tracking branch 'origin/development' into adl-p
Nir-Az 5e26e12
PR #11485 from Nir-Az: align adl-p to dev
Nir-Az 06644ee
backend: dfu - add support for multiple cameras
058726d
scripts: rs-enum: cleanup
0c69294
PR #11472 from dmipx: backend: dfu - add support for multiple cameras
Nir-Az 64dd453
[ADL-P] Automate rs-enum script to udev rules
022bad7
PR #11550 from dmipx: Automate rs-enum script to udev rules
Nir-Az 0e613b5
rs-enum: support for metadata nodes format updates
a58c7df
PR #11592 from dmipx: rs-enum: support for metadata nodes format updates
Nir-Az 875270f
Merge remote-tracking branch 'origin/development' into adl-p
Nir-Az 71da796
PR #11605 from Nir-Az: Align ADL-P to development (23/3)
Nir-Az 95a7572
adl-p temporary disable metadata node
5f1f209
PR #11618 from dmipx: adl-p temporary disable metadata node
Nir-Az 32b7038
Merge remote-tracking branch 'origin/development' into adl-p
Nir-Az f0939d4
PR #11832 from Nir-Az: align adl-p to development (23/5/23)
Nir-Az fd1f272
backend-v4l: ipu6 integration
7498df3
udev rules: update dfu filter for all d4xx dfu node names
154b658
backend-v4l2: use custom structure for metadata.
8786dc5
scripts: enable metadata bindings.
c2b47dd
PR #11822 from dmipx: Adlp metadata
Nir-Az 7fbdd13
backend-v4l: stop metadata before video for ipu6
fe656b7
PR #11902 from dmipx: backend-v4l: stop metadata before video for ipu6
Nir-Az a2336b8
scripts: ipu6: fix media controller index
8bba296
scripts: enum/bind check for dependencies.
ba793d1
PR #11969 from dmipx: scripts: ipu6: fix media controller index
Nir-Az afb06fd
Merge remote-tracking branch 'origin/development' into adl-p
Nir-Az 1a02ed2
PR #12032 from Nir-Az: align adl-p to development (24/7/23)
Nir-Az e13b9d5
scripts: rs-enum: update enumeration for jetson devices.
1c3769f
scripts: udev: unify tegra and ipu6 rules
4ee1057
scripts: ipu6-bind: skip for non ipu6 case.
5083434
scripts: rs-enum: remove sudo, check for root user on run.
6f34bbb
scripts: udev: Merge all mipi platforms to single rule.
4c61dea
PR #12023 from dmipx: scripts: rs-enum: update enumeration for jetson…
Nir-Az 4612539
scripts: ipu6 aggregated camera support.
439c5a0
PR #12070 from dmipx: scripts: ipu6 aggregated camera support.
Nir-Az e9e57bf
-sscripts: ipu6 bind commentary
0abacd1
PR #12102 from dmipx: scripts: ipu6 bind commentary
Nir-Az 812cf43
PR #12108 from IntelRealSense: adl-p align to development
Nir-Az File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| ##Version=1.0## | ||
| # Device rules for Intel RealSense MIPI devices on IPU6 | ||
| #KERNEL=="d4xx", SUBSYSTEM=="module", RUN+="/bin/bash -c 'echo UDEV-D4XX > /dev/kmsg'" | ||
| SUBSYSTEM=="video4linux", ATTR{name}=="DS5 mux a", RUN+="/bin/bash -c 'echo UDEV-%s{name} > /dev/kmsg; /usr/local/bin/rs_ipu6_d457_bind.sh -m a > /dev/kmsg; /usr/local/bin/rs-enum.sh -q -m a > /dev/kmsg'" | ||
| SUBSYSTEM=="video4linux", ATTR{name}=="DS5 mux b", RUN+="/bin/bash -c 'echo UDEV-%s{name} > /dev/kmsg; /usr/local/bin/rs_ipu6_d457_bind.sh -m b > /dev/kmsg; /usr/local/bin/rs-enum.sh -q -m b > /dev/kmsg'" | ||
| SUBSYSTEM=="video4linux", ATTR{name}=="DS5 mux c", RUN+="/bin/bash -c 'echo UDEV-%s{name} > /dev/kmsg; /usr/local/bin/rs_ipu6_d457_bind.sh -m c > /dev/kmsg; /usr/local/bin/rs-enum.sh -q -m c > /dev/kmsg'" | ||
| SUBSYSTEM=="video4linux", ATTR{name}=="DS5 mux d", RUN+="/bin/bash -c 'echo UDEV-%s{name} > /dev/kmsg; /usr/local/bin/rs_ipu6_d457_bind.sh -m d > /dev/kmsg; /usr/local/bin/rs-enum.sh -q -m d > /dev/kmsg'" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| #!/bin/bash | ||
| # d457_bind.sh | ||
| while [[ $# -gt 0 ]]; do | ||
| case $1 in | ||
| -q|--quiet) | ||
| quiet=1 | ||
| shift | ||
| ;; | ||
| -m|--mux) | ||
| shift | ||
| mux_param=$1 | ||
| shift | ||
| ;; | ||
| *) | ||
| quiet=0 | ||
| shift | ||
| ;; | ||
| esac | ||
| done | ||
|
|
||
| declare -A media_mux_capture_link=( [a]='' [b]='1 ' [c]='2 ' [d]='3 ' ) | ||
| declare -A media_mux_csi2_link=( [a]=0 [b]=1 [c]=2 [d]=3 ) | ||
|
|
||
| declare -A serdes_mux_i2c_bus=( [a]=2 [b]=2 [c]=4 [d]=4 ) | ||
| mux_list=${mux_param:-'a b c d'} | ||
|
|
||
| #media-ctl -r | ||
| # cache media-ctl output | ||
| dot=$(media-ctl --print-dot) | ||
|
|
||
| # DS5 MUX. Can be {a, b, c, d}. | ||
| for mux in $mux_list; do | ||
| is_mux=$(echo "${dot}" | grep "DS5 mux ${mux}") | ||
| [[ -z $is_mux ]] && continue; | ||
|
|
||
| [[ $quiet -eq 0 ]] && echo -n "Bind DS5 mux ${mux} .. " | ||
| csi2_be_soc="CSI2 BE SOC ${media_mux_csi2_link[${mux}]}" | ||
|
|
||
| csi2="CSI-2 ${media_mux_csi2_link[${mux}]}" | ||
|
|
||
| be_soc_cap="BE SOC ${media_mux_capture_link[${mux}]}capture" | ||
|
|
||
| media-ctl -v -l "\"Intel IPU6 ${csi2}\":1 -> \"Intel IPU6 ${csi2_be_soc}\":0[1]" 1>/dev/null | ||
| media-ctl -v -l "\"DS5 mux ${mux}\":0 -> \"Intel IPU6 ${csi2}\":0[1]" 1>/dev/null | ||
|
|
||
| media-ctl -v -l "\"D4XX depth ${mux}\":0 -> \"DS5 mux ${mux}\":1[1]" 1>/dev/null | ||
| # video streaming node | ||
| media-ctl -v -l "\"Intel IPU6 ${csi2_be_soc}\":1 -> \"Intel IPU6 ${be_soc_cap} 0\":0[5]" 1>/dev/null | ||
| # metadata node | ||
| media-ctl -v -l "\"Intel IPU6 ${csi2_be_soc}\":2 -> \"Intel IPU6 ${be_soc_cap} 1\":0[5]" 1>/dev/null | ||
|
|
||
| media-ctl -v -l "\"D4XX rgb ${mux}\":0 -> \"DS5 mux ${mux}\":2[1]" 1>/dev/null | ||
| # RGB link | ||
| media-ctl -v -l "\"Intel IPU6 ${csi2_be_soc}\":3 -> \"Intel IPU6 ${be_soc_cap} 2\":0[5]" 1>/dev/null | ||
| # RGB metadata node | ||
| media-ctl -v -l "\"Intel IPU6 ${csi2_be_soc}\":4 -> \"Intel IPU6 ${be_soc_cap} 3\":0[5]" 1>/dev/null | ||
|
|
||
| # IR link | ||
| media-ctl -v -l "\"D4XX motion detection ${mux}\":0 -> \"DS5 mux ${mux}\":3[1]" 1>/dev/null | ||
| media-ctl -v -l "\"Intel IPU6 ${csi2_be_soc}\":5 -> \"Intel IPU6 ${be_soc_cap} 4\":0[5]" 1>/dev/null | ||
|
|
||
| # IMU link | ||
| media-ctl -v -l "\"D4XX imu ${mux}\":0 -> \"DS5 mux ${mux}\":4[1]" 1>/dev/null | ||
| media-ctl -v -l "\"Intel IPU6 ${csi2_be_soc}\":6 -> \"Intel IPU6 ${be_soc_cap} 5\":0[5]" 1>/dev/null | ||
| [[ $quiet -eq 0 ]] && echo done | ||
| done |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| #!/bin/bash -e | ||
|
|
||
| # USAGE: | ||
| # Normal usecase - without any parameters. | ||
| # | ||
| # [optional parameters]: | ||
| # --uninstall : remove permissions for realsense devices. | ||
|
|
||
| install=true | ||
|
|
||
| for var in "$@" | ||
| do | ||
| if [ "$var" = "--uninstall" ]; then | ||
| install=false | ||
| fi | ||
| done | ||
|
|
||
| if [ "$install" = true ]; then | ||
| echo "Setting-up binding IPU6 and D4XX for RealSense devices" | ||
| else | ||
| echo "Remove binding for RealSense devices" | ||
| fi | ||
|
|
||
| if [ "$install" = true ]; then | ||
| sudo cp scripts/rs-enum.sh /usr/local/bin/rs-enum.sh | ||
| sudo cp scripts/rs_ipu6_d457_bind.sh /usr/local/bin/rs_ipu6_d457_bind.sh | ||
| sudo cp config/99-realsense-d4xx-ipu6.rules /etc/udev/rules.d/ | ||
| else | ||
| sudo rm /etc/udev/rules.d/99-realsense-d4xx-ipu6.rules | ||
| sudo rm /usr/local/bin/rs_ipu6_d457_bind.sh | ||
| sudo rm /usr/local/bin/rs-enum.sh | ||
| fi | ||
|
|
||
| sudo udevadm control --reload-rules && sudo udevadm trigger | ||
| if [ "$install" = true ]; then | ||
| echo "udev-rules successfully installed" | ||
| else | ||
| echo "udev-rules successfully uninstalled" | ||
| fi |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add some comment with explanation of the commands sent in this script
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you are not commenting c++ code for every magic you do.
This is simple filtering, nothing specific can be commented. No magic involved.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think Remi meant command line parameters
i.e.