Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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]
Jan 5, 2023
21acbcb
PR #11295 from dmipx: [ADL-P] LRS V4L2 Backend MPLANE streaming suppo…
Nir-Az Jan 8, 2023
68d5f5e
color processing block acc to platform
remibettan Jan 5, 2023
4084c7c
using gev_dev_capabilities method
remibettan Jan 8, 2023
abd95d8
cr
remibettan Jan 10, 2023
a416a09
PR #11294 from remibettan: color processing block acc to platform
Nir-Az Jan 11, 2023
3cb1dd9
Enumerate video nodes by name
Jan 12, 2023
3e6b496
Following code review.
Jan 16, 2023
996d7b6
PR #11319 from dmipx: Enumerate video nodes by name
Nir-Az Jan 19, 2023
f00007b
merge development
Nir-Az Feb 13, 2023
ed4e624
PR #11435 from Nir-Az: Align ADL-P to Development
Nir-Az Feb 14, 2023
38dfbbf
Merge remote-tracking branch 'origin/development' into adl-p
Nir-Az Feb 26, 2023
5e26e12
PR #11485 from Nir-Az: align adl-p to dev
Nir-Az Feb 27, 2023
06644ee
backend: dfu - add support for multiple cameras
Feb 22, 2023
058726d
scripts: rs-enum: cleanup
Mar 1, 2023
0c69294
PR #11472 from dmipx: backend: dfu - add support for multiple cameras
Nir-Az Mar 2, 2023
64dd453
[ADL-P] Automate rs-enum script to udev rules
Mar 9, 2023
022bad7
PR #11550 from dmipx: Automate rs-enum script to udev rules
Nir-Az Mar 12, 2023
0e613b5
rs-enum: support for metadata nodes format updates
Mar 20, 2023
a58c7df
PR #11592 from dmipx: rs-enum: support for metadata nodes format updates
Nir-Az Mar 21, 2023
875270f
Merge remote-tracking branch 'origin/development' into adl-p
Nir-Az Mar 23, 2023
71da796
PR #11605 from Nir-Az: Align ADL-P to development (23/3)
Nir-Az Mar 26, 2023
95a7572
adl-p temporary disable metadata node
Mar 27, 2023
5f1f209
PR #11618 from dmipx: adl-p temporary disable metadata node
Nir-Az Mar 28, 2023
32b7038
Merge remote-tracking branch 'origin/development' into adl-p
Nir-Az May 23, 2023
f0939d4
PR #11832 from Nir-Az: align adl-p to development (23/5/23)
Nir-Az May 24, 2023
fd1f272
backend-v4l: ipu6 integration
May 18, 2023
7498df3
udev rules: update dfu filter for all d4xx dfu node names
May 21, 2023
154b658
backend-v4l2: use custom structure for metadata.
May 22, 2023
8786dc5
scripts: enable metadata bindings.
May 24, 2023
c2b47dd
PR #11822 from dmipx: Adlp metadata
Nir-Az May 25, 2023
7fbdd13
backend-v4l: stop metadata before video for ipu6
Jun 5, 2023
fe656b7
PR #11902 from dmipx: backend-v4l: stop metadata before video for ipu6
Nir-Az Jun 14, 2023
a2336b8
scripts: ipu6: fix media controller index
Jul 5, 2023
8bba296
scripts: enum/bind check for dependencies.
Jul 17, 2023
ba793d1
PR #11969 from dmipx: scripts: ipu6: fix media controller index
Nir-Az Jul 20, 2023
afb06fd
Merge remote-tracking branch 'origin/development' into adl-p
Nir-Az Jul 24, 2023
1a02ed2
PR #12032 from Nir-Az: align adl-p to development (24/7/23)
Nir-Az Jul 24, 2023
e13b9d5
scripts: rs-enum: update enumeration for jetson devices.
Jul 20, 2023
1c3769f
scripts: udev: unify tegra and ipu6 rules
Jul 23, 2023
4ee1057
scripts: ipu6-bind: skip for non ipu6 case.
Jul 24, 2023
5083434
scripts: rs-enum: remove sudo, check for root user on run.
Jul 24, 2023
6f34bbb
scripts: udev: Merge all mipi platforms to single rule.
Jul 24, 2023
4c61dea
PR #12023 from dmipx: scripts: rs-enum: update enumeration for jetson…
Nir-Az Aug 1, 2023
4612539
scripts: ipu6 aggregated camera support.
Aug 4, 2023
439c5a0
PR #12070 from dmipx: scripts: ipu6 aggregated camera support.
Nir-Az Aug 9, 2023
e9e57bf
-sscripts: ipu6 bind commentary
Aug 14, 2023
0abacd1
PR #12102 from dmipx: scripts: ipu6 bind commentary
Nir-Az Aug 14, 2023
812cf43
PR #12108 from IntelRealSense: adl-p align to development
Nir-Az Aug 15, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
scripts: enum/bind check for dependencies.
Signed-off-by: Dmitry Perchanov <dmitry.perchanov@intel.com>
  • Loading branch information
Dmitry Perchanov committed Jul 17, 2023
commit 8bba296a52b14f246902b09294e2307dee36b41d
25 changes: 16 additions & 9 deletions scripts/rs-enum.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@
# i2c 2 d4xx Firmware /dev/d4xx-dfu-c /dev/d4xx-dfu-2

# Dependency: v4l-utils
v4l2_util=$(which v4l2-ctl)
media_util=$(which media-ctl)
if [ -z ${v4l2_util} ]; then
echo "v4l2-ctl not found, install with: sudo apt install v4l-utils"
exit 1
fi

#
# parse command line parameters
# for '-i' parameter, print links only
Expand Down Expand Up @@ -71,15 +78,15 @@ camera_vid=("depth" "depth-md" "color" "color-md" "ir" "imu")
[[ $quiet -eq 0 ]] && printf "Bus\tCamera\tSensor\tNode Type\tVideo Node\tRS Link\n"

# For Jetson we have simple method
if [ -n "$(v4l2-ctl --list-devices | grep tegra)" ]; then
if [ -n "$(${v4l2_util} --list-devices | grep tegra)" ]; then
for ((i = 0; i < 127; i++)); do
if [ ! -c /dev/video${i} ]; then
break;
fi
cam_id=$((i/6))
sens_id=$((i%6))
vid="/dev/video${i}"
dev_name=$(v4l2-ctl -d ${vid} -D | grep 'Driver name' | head -n1 | awk -F' : ' '{print $2}')
dev_name=$(${v4l2_util} -d ${vid} -D | grep 'Driver name' | head -n1 | awk -F' : ' '{print $2}')
dev_ln="/dev/video-rs-${camera_vid[${sens_id}]}-${cam_id}"
bus="mipi"
if [ "$dev_name" = "uvcvideo" ]; then
Expand All @@ -98,7 +105,7 @@ if [ -n "$(v4l2-ctl --list-devices | grep tegra)" ]; then
[[ -e $dev_ln ]] && sudo unlink $dev_ln
sudo ln -s $vid $dev_ln
# Create DFU device link for camera on jetson
subdev=$(media-ctl --print-dot | grep "D4XX depth ${camera} | awk -F'|' '{print $2}' | awk -F'/' '{print $3}' | tr -d ' '")
subdev=$(${media_util} --print-dot | grep "D4XX depth ${camera} | awk -F'|' '{print $2}' | awk -F'/' '{print $3}' | tr -d ' '")
i2cdev=$(ls -l /sys/class/video4linux/${subdev}/device | awk -F'/' '{print $9}')
dev_dfu_name="/dev/d4xx-dfu-${i2cdev}"
dev_dfu_ln="/dev/d4xx-dfu-${cam_id}"
Expand All @@ -110,10 +117,10 @@ exit 0
fi

#ADL-P IPU6
mdev=$(v4l2-ctl --list-devices | grep -A1 ipu6 | grep media)
mdev=$(${v4l2_util} --list-devices | grep -A1 ipu6 | grep media)
#media-ctl -r
# cache media-ctl output
dot=$(media-ctl -d ${mdev} --print-dot)
dot=$(${media_util} -d ${mdev} --print-dot)
# for all d457 muxes a, b, c and d
for camera in $mux_list; do
create_dfu_dev=0
Expand All @@ -133,7 +140,7 @@ for camera in $mux_list; do
vid=$(echo "${dot}" | grep "${vid_nd}" | grep video | tr '\\n' '\n' | grep video | awk -F'"' '{print $1}')
[[ -z $vid ]] && continue;
dev_ln="/dev/video-rs-${camera_names["${sens}"]}-${camera_idx[${camera}]}"
dev_name=$(v4l2-ctl -d $vid -D | grep Model | awk -F':' '{print $2}')
dev_name=$(${v4l2_util} -d $vid -D | grep Model | awk -F':' '{print $2}')

[[ $quiet -eq 0 ]] && printf '%s\t%d\t%s\tStreaming\t%s\t%s\n' "$dev_name" ${camera_idx[${camera}]} ${camera_names["${sens}"]} $vid $dev_ln

Expand All @@ -142,7 +149,7 @@ for camera in $mux_list; do
[[ -e $dev_ln ]] && sudo unlink $dev_ln
sudo ln -s $vid $dev_ln
# activate ipu6 link enumeration feature
v4l2-ctl -d $dev_ln -c enumerate_graph_link=1
${v4l2_util} -d $dev_ln -c enumerate_graph_link=1
fi
create_dfu_dev=1 # will create DFU device link for camera
# metadata link
Expand All @@ -153,14 +160,14 @@ for camera in $mux_list; do

vid_num=$(echo $vid | grep -o '[0-9]\+')
dev_md_ln="/dev/video-rs-${camera_names["${sens}"]}-md-${camera_idx[${camera}]}"
dev_name=$(v4l2-ctl -d "/dev/video$(($vid_num+1))" -D | grep Model | awk -F':' '{print $2}')
dev_name=$(${v4l2_util} -d "/dev/video$(($vid_num+1))" -D | grep Model | awk -F':' '{print $2}')

[[ $quiet -eq 0 ]] && printf '%s\t%d\t%s\tMetadata\t/dev/video%s\t%s\n' "$dev_name" ${camera_idx[${camera}]} ${camera_names["${sens}"]} $(($vid_num+1)) $dev_md_ln
# create link only in case we choose not only to show it
if [[ $info -eq 0 ]]; then
[[ -e $dev_md_ln ]] && sudo unlink $dev_md_ln
sudo ln -s "/dev/video$(($vid_num+1))" $dev_md_ln
v4l2-ctl -d $dev_md_ln -c enumerate_graph_link=3
${v4l2_util} -d $dev_md_ln -c enumerate_graph_link=3
fi
done
# create DFU device link for camera
Expand Down
12 changes: 10 additions & 2 deletions scripts/rs_ipu6_d457_bind.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
#!/bin/bash
# Dependency: v4l-utils
Copy link
Copy Markdown
Contributor

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

v4l2_util=$(which v4l2-ctl)
media_util=$(which media-ctl)
if [ -z ${v4l2_util} ]; then
echo "v4l2-ctl not found, install with: sudo apt install v4l-utils"
exit 1
fi

# d457_bind.sh
while [[ $# -gt 0 ]]; do
case $1 in
Expand All @@ -24,8 +32,8 @@ 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'}

mdev=$(v4l2-ctl --list-devices | grep -A1 ipu6 | grep media)
media_ctl_cmd="$(which media-ctl) -d ${mdev}"
mdev=$(${v4l2_util} --list-devices | grep -A1 ipu6 | grep media)
media_ctl_cmd="${media_util} -d ${mdev}"
#media-ctl -r
# cache media-ctl output
dot=$($media_ctl_cmd --print-dot)
Expand Down