diff --git a/external/config/boards/orangepi5.conf b/external/config/boards/orangepi5.conf index 0f5521a..da7ee50 100644 --- a/external/config/boards/orangepi5.conf +++ b/external/config/boards/orangepi5.conf @@ -10,6 +10,6 @@ BOOT_SCENARIO="spl-blobs" IMAGE_PARTITION_TABLE="gpt" BOOT_SUPPORT_SPI="yes" SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes -DISTRIB_TYPE_LEGACY="bullseye jammy" +DISTRIB_TYPE_LEGACY="bullseye focal jammy" BOOTFS_TYPE="fat" -REVISION="1.0.4" +REVISION="1.0.6" diff --git a/external/config/kernel/linux-rockchip-rk3588-legacy.config b/external/config/kernel/linux-rockchip-rk3588-legacy.config index 06bc84b..925430a 100644 --- a/external/config/kernel/linux-rockchip-rk3588-legacy.config +++ b/external/config/kernel/linux-rockchip-rk3588-legacy.config @@ -940,8 +940,9 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_CMA=y # CONFIG_CMA_INACTIVE is not set # CONFIG_CMA_DEBUG is not set -# CONFIG_CMA_DEBUGFS is not set -# CONFIG_CMA_SYSFS is not set +CONFIG_CMA_DEBUGFS=y +CONFIG_CMA_DEBUGFS_BITMAP_HEX=y +CONFIG_CMA_SYSFS=y CONFIG_CMA_AREAS=7 # CONFIG_ZPOOL is not set # CONFIG_ZBUD is not set @@ -4441,15 +4442,15 @@ CONFIG_VIDEO_OV13855=y # # Lens drivers # -# CONFIG_VIDEO_AD5820 is not set -# CONFIG_VIDEO_AK7375 is not set -# CONFIG_VIDEO_AW8601 is not set -# CONFIG_VIDEO_CN3927V is not set -# CONFIG_VIDEO_DW9714 is not set -# CONFIG_VIDEO_DW9768 is not set -# CONFIG_VIDEO_DW9800W is not set -# CONFIG_VIDEO_DW9807_VCM is not set -# CONFIG_VIDEO_FP5510 is not set +CONFIG_VIDEO_AD5820=m +CONFIG_VIDEO_AK7375=m +CONFIG_VIDEO_AW8601=m +CONFIG_VIDEO_CN3927V=m +CONFIG_VIDEO_DW9714=m +CONFIG_VIDEO_DW9768=m +CONFIG_VIDEO_DW9800W=m +CONFIG_VIDEO_DW9807_VCM=m +CONFIG_VIDEO_FP5510=m # end of Lens drivers # diff --git a/external/config/optional/families/rockchip-rk3588/_config/desktop/focal/environments/xfce/config_base/packages b/external/config/optional/families/rockchip-rk3588/_config/desktop/focal/environments/xfce/config_base/packages new file mode 100644 index 0000000..ab8b568 --- /dev/null +++ b/external/config/optional/families/rockchip-rk3588/_config/desktop/focal/environments/xfce/config_base/packages @@ -0,0 +1,52 @@ +gstreamer1.0-plugins-bad +gstreamer1.0-plugins-base +gstreamer1.0-plugins-ugly +gstreamer1.0-tools +gstreamer1.0-alsa +gstreamer1.0-plugins-base-apps +qtmultimedia5-examples +libdw1 libdw-dev +libelf-dev +liblzma-dev +libunwind-dev +libavformat58 +libbluray2 +libjsoncpp-dev +libjsoncpp1 +libminizip1 +libssh-gcrypt-4 +libdrm-etnaviv1 +libdrm-freedreno1 +libdrm-tegra0 +libpciaccess-dev +libmysofa1 +libnorm1 +libpgm-5.2-0 +librubberband2 +libsodium23 +libvidstab1.1 +libzmq5 +libxv1 +liblua5.2-0 +libva-wayland2 +glmark2-es2 +glmark2 +audacity +tightvncserver +xrdp +geany +clinfo +fcitx-sunpinyin +fcitx-table-cangjie +fonts-noto-cjk-extra +fcitx-frontend-gtk3 +fcitx-ui-classic +fcitx-table-wubi +fcitx-module-cloudpinyin +fcitx-ui-qimpanel +fcitx-chewing +fcitx-pinyin +fonts-noto-cjk +fcitx-frontend-qt5 +fcitx-frontend-gtk2 +gparted diff --git a/external/config/sources/families/include/rk3588_gpu_vpu.inc b/external/config/sources/families/include/rk3588_gpu_vpu.inc index 9d0faaf..d273d32 100755 --- a/external/config/sources/families/include/rk3588_gpu_vpu.inc +++ b/external/config/sources/families/include/rk3588_gpu_vpu.inc @@ -7,8 +7,8 @@ rk3588_gpu_vpu_tweaks() #chroot $SDCARD /bin/bash -c "apt-get update" #chroot $SDCARD /bin/bash -c "apt-get upgrade -y" - # RK GPU VPU dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/rkaiq/camera-engine-rkaiq_rk3588_arm64.deb" + cp "$EXTER/cache/sources/rk3588_packages_${RELEASE}/rkaiq/rkaiq_3A_server" $SDCARD/usr/bin/ -f dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/rga2/librga2_2.2.0-1_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/rga2/librga-dev_2.2.0-1_arm64.deb" @@ -133,8 +133,8 @@ rk3588_gpu_vpu_tweaks() #chroot $SDCARD /bin/bash -c "apt-get upgrade -y" > /dev/null chroot $SDCARD /bin/bash -c "apt-get install -y libgraphene-1.0-0" > /dev/null - # RK GPU VPU dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/rkaiq/camera-engine-rkaiq_rk3588_arm64.deb" + cp "$EXTER/cache/sources/rk3588_packages_${RELEASE}/rkaiq/rkaiq_3A_server" $SDCARD/usr/bin/ -f dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/rga2/librga2_2.2.0-1_arm64.deb" dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/rga2/librga-dev_2.2.0-1_arm64.deb" @@ -251,4 +251,115 @@ rk3588_gpu_vpu_tweaks() #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mesa/libglx-mesa0_23.0~panfork~csf~git221206.c0a7a787026~j_arm64.deb" fi + + if [[ ${BOARD} =~ orangepi5 && ${SELECTED_CONFIGURATION} == desktop && ${RELEASE} == focal ]]; then + + chroot $SDCARD /bin/bash -c "chmod o+x /usr/lib/dbus-1.0/dbus-daemon-launch-helper" + + #chroot $SDCARD /bin/bash -c "apt-get update" + #chroot $SDCARD /bin/bash -c "apt-get upgrade -y" > /dev/null + #chroot $SDCARD /bin/bash -c "apt-get install -y " > /dev/null + + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/rkaiq/camera-engine-rkaiq_arm64.deb" + cp "$EXTER/cache/sources/rk3588_packages_${RELEASE}/rkaiq/rkaiq_3A_server" $SDCARD/usr/bin/ -f + + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/rga/librga2_2.2.0-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/rga/librga-dev_2.2.0-1_arm64.deb" + + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/mpp/librockchip-mpp1_1.5.0-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/mpp/librockchip-mpp-dev_1.5.0-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/mpp/librockchip-vpu0_1.5.0-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/mpp/rockchip-mpp-demos_1.5.0-1_arm64.deb" + + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-rkmpp/gstreamer1.0-rockchip1_1.14-4_arm64.deb" + + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gstreamer/libgstreamer1.0-0_1.18.5-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gstreamer/libgstreamer1.0-dev_1.18.5-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gstreamer/gir1.2-gstreamer-1.0_1.18.5-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gstreamer/gstreamer1.0-tools_1.18.5-1_arm64.deb" + + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-base1.0/libgstreamer-gl1.0-0_1.18.5-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-base1.0/gir1.2-gst-plugins-base-1.0_1.18.5-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-base1.0/gstreamer1.0-alsa_1.18.5-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-base1.0/gstreamer1.0-plugins-base_1.18.5-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-base1.0/gstreamer1.0-plugins-base-apps_1.18.5-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-base1.0/gstreamer1.0-x_1.18.5-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-base1.0/libgstreamer-gl1.0-0_1.18.5-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-base1.0/libgstreamer-plugins-base1.0-0_1.18.5-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-base1.0/libgstreamer-plugins-base1.0-dev_1.18.5-1_arm64.deb" + + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-bad1.0/gstreamer1.0-plugins-bad_1.18.5-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-bad1.0/libgstreamer-plugins-bad1.0-0_1.18.5-1_arm64.deb" + + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-good1.0/gstreamer1.0-plugins-good_1.18.5-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-good1.0/gstreamer1.0-pulseaudio_1.18.5-1_arm64.deb" + + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libv4l/libdvbv5-0_1.18.0-2build1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libv4l/dvb-tools_1.18.0-2build1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libv4l/ir-keytable_1.18.0-2build1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libv4l/libdvbv5-dev_1.18.0-2build1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libv4l/libdvbv5-doc_1.18.0-2build1_all.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libv4l/libv4l-0_1.18.0-2build1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libv4l/libv4l2rds0_1.18.0-2build1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libv4l/libv4lconvert0_1.18.0-2build1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libv4l/libv4l-dev_1.18.0-2build1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libv4l/libv4l-rkmpp_1.4.0-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libv4l/v4l-utils_1.18.0-2build1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libv4l/qv4l2_1.18.0-2build1_arm64.deb" + + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/xserver/xserver-xorg-core_1.20.13-1ubuntu1~20.04.2_arm64.deb" + + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/chromium/chromium-x11_91.0.4472.164_arm64.deb" + cp ${EXTER}/cache/sources/rk3588_packages_focal/chromium/libjpeg.so.62 $SDCARD/usr/lib/aarch64-linux-gnu/ + + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libdrm/libdrm2_2.4.107-8ubuntu1~20.04.2_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libdrm/libdrm-common_2.4.107-8ubuntu1~20.04.2_all.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libdrm/libdrm-dev_2.4.107-8ubuntu1~20.04.2_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libdrm/libkms1_2.4.107-8ubuntu1~20.04.2_arm64.deb" + + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libdrm-cursor/libdrm-cursor_1.3.0-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libdrm-cursor/libdrm-cursor-dev_1.3.0-1_arm64.deb" + #chroot $SDCARD /bin/bash -c "sed -i '5aexport LD_PRELOAD=libdrm-cursor.so.1' /usr/bin/X" + + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/rktoolkit/rktoolkit_1.0.0-1_arm64.deb" + + install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/libmali/libmali-valhall-g610-g6p0-x11_1.9-1_arm64.deb" + + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gl4es/gl4es_1.1.5-0armbian1_arm64.deb" + + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/ffmpeg/libavutil56_4.2.7-0ubuntu0.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/ffmpeg/libavutil-dev_4.2.7-0ubuntu0.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/ffmpeg/libpostproc55_4.2.7-0ubuntu0.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/ffmpeg/libpostproc-dev_4.2.7-0ubuntu0.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/ffmpeg/libswresample3_4.2.7-0ubuntu0.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/ffmpeg/libswresample-dev_4.2.7-0ubuntu0.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/ffmpeg/libswscale5_4.2.7-0ubuntu0.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/ffmpeg/libswscale-dev_4.2.7-0ubuntu0.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/ffmpeg/libavcodec58_4.2.7-0ubuntu0.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/ffmpeg/libavcodec-dev_4.2.7-0ubuntu0.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/ffmpeg/libavformat58_4.2.7-0ubuntu0.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/ffmpeg/libavformat-dev_4.2.7-0ubuntu0.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/ffmpeg/libavfilter7_4.2.7-0ubuntu0.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/ffmpeg/libavfilter-dev_4.2.7-0ubuntu0.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/ffmpeg/libavdevice58_4.2.7-0ubuntu0.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/ffmpeg/libavdevice-dev_4.2.7-0ubuntu0.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/ffmpeg/libavresample4_4.2.7-0ubuntu0.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/ffmpeg/libavresample-dev_4.2.7-0ubuntu0.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/ffmpeg/ffmpeg_4.2.7-0ubuntu0.1_arm64.deb" + + chroot $SDCARD /bin/bash -c "rm /etc/mpv/mpv.conf" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/mpv/libmpv1_0.32.0-1ubuntu1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/mpv/libmpv-dev_0.32.0-1ubuntu1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/mpv/mpv_0.32.0-1ubuntu1_arm64.deb" + cp ${EXTER}/packages/bsp/rk3588/etc/mpv/mpv.conf $SDCARD/etc/mpv/ + + ## The chromium using fixed pathes for libv4l2.so + chroot $SDCARD /bin/bash -c "ln -rsf /usr/lib/*/libv4l2.so /usr/lib/" + chroot $SDCARD /bin/bash -c "[ -e /usr/lib/aarch64-linux-gnu/ ] && ln -Tsf lib /usr/lib64" + + chroot $SDCARD /bin/bash -c "cd /usr/lib/aarch64-linux-gnu/dri/;cp kms_swrast_dri.so swrast_dri.so rockchip_dri.so /" + chroot $SDCARD /bin/bash -c "rm /usr/lib/aarch64-linux-gnu/dri/*.so;mv /*.so /usr/lib/aarch64-linux-gnu/dri/" + + fi } + diff --git a/external/packages/bsp/rk3588/etc/profile.d/qt.sh b/external/packages/bsp/rk3588/etc/profile.d/qt.sh deleted file mode 100644 index 3cf2289..0000000 --- a/external/packages/bsp/rk3588/etc/profile.d/qt.sh +++ /dev/null @@ -1 +0,0 @@ -export QT_XCB_GL_INTEGRATION=xcb_egl diff --git a/external/packages/bsp/rk3588/etc/profile.d/qtwebengine.sh b/external/packages/bsp/rk3588/etc/profile.d/qtwebengine.sh deleted file mode 100644 index 881323d..0000000 --- a/external/packages/bsp/rk3588/etc/profile.d/qtwebengine.sh +++ /dev/null @@ -1 +0,0 @@ -export QTWEBENGINE_CHROMIUM_FLAGS="--no-sandbox --disable-es3-gl-context --ignore-gpu-blacklist --ignore-gpu-blocklist --enable-accelerated-video-decode" diff --git a/external/packages/bsp/rk3588/usr/local/bin/gpu_load.sh b/external/packages/bsp/rk3588/usr/local/bin/gpu_load.sh new file mode 100755 index 0000000..45983ea --- /dev/null +++ b/external/packages/bsp/rk3588/usr/local/bin/gpu_load.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +while true; do + + gpu_load=$(cat /sys/devices/platform/fb000000.gpu/devfreq/fb000000.gpu/load | cut -d "@" -f 1) + echo $(date "+%H:%M:%S") : GPU load is : ${gpu_load}% + sleep 1 + +done diff --git a/external/packages/bsp/rk3588/usr/local/bin/install_qt.sh b/external/packages/bsp/rk3588/usr/local/bin/install_qt.sh new file mode 100755 index 0000000..9bdcd2d --- /dev/null +++ b/external/packages/bsp/rk3588/usr/local/bin/install_qt.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +release=$(lsb_release -cs) + +sudo apt update +if [[ $release =~ focal|bionic|buster ]]; then + sudo apt-get -y install qt5-default qttools5-dev-tools qtbase5-doc-html qt5-assistant qt5-doc +elif [[ $release =~ bullseye|jammy ]]; then + sudo apt-get -y install qttools5-dev-tools qtbase5-doc-html qt5-assistant qt5-doc qt5-qmake qt5-qmake-bin +else + echo "Unsupported system!" + exit +fi + +sudo apt-get -y install qtcreator qmlscene gdb qtdeclarative5-dev qtbase5-examples cmake + +sudo chown orangepi:orangepi /usr/lib/aarch64-linux-gnu/qt5/examples -R + +qmake -v diff --git a/external/packages/bsp/rk3588/usr/local/bin/install_ros.sh b/external/packages/bsp/rk3588/usr/local/bin/install_ros.sh new file mode 100755 index 0000000..42703dd --- /dev/null +++ b/external/packages/bsp/rk3588/usr/local/bin/install_ros.sh @@ -0,0 +1,74 @@ +#!/bin/bash + +#mirror_url=http://mirrors.ustc.edu.cn +mirror_url=https://repo.huaweicloud.com + +if [[ -n $1 ]]; then + version=$1 +else + echo "usage: install_ros.sh ros1/ros2" + exit +fi + +release=$(lsb_release -cs) + +if [[ $version == "ros1" && $release =~ focal ]]; then + + [[ -f /etc/apt/sources.list.d/ros-latest.list ]] && sudo rm /etc/apt/sources.list.d/ros-latest.list + sudo sh -c "echo deb ${mirror_url}/ros/ubuntu $(lsb_release -sc) main > /etc/apt/sources.list.d/ros1.list" + sudo apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 + sudo apt update + sudo apt install -y ros-noetic-desktop-full + + sudo sh -c 'echo "source /opt/ros/noetic/setup.bash" >> /root/.bashrc' + echo "source /opt/ros/noetic/setup.bash" >> /home/orangepi/.bashrc + + sudo apt install -y python3-rosdep python3-rosinstall python3-rosinstall-generator python3-wstool build-essential + + sudo sh -c 'echo "151.101.84.133 raw.githubusercontent.com" >> /etc/hosts' + source /opt/ros/noetic/setup.bash + sudo rosdep init + rosdep update + + exit +fi + +if [[ $version == "ros2" && $release =~ focal ]]; then + + sudo apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 + echo "deb [arch=$(dpkg --print-architecture)] ${mirror_url}/ros2/ubuntu $(source /etc/os-release && echo $UBUNTU_CODENAME) main" | sudo tee /etc/apt/sources.list.d/ros2.list + + sudo apt update + sudo apt install -y ros-galactic-desktop + sudo apt install -y ros-dev-tools + + sudo sh -c 'echo "source /opt/ros/galactic/setup.bash" >> /root/.bashrc' + echo "source /opt/ros/galactic/setup.bash" >> /home/orangepi/.bashrc + + source /opt/ros/galactic/setup.bash + ros2 -h + + exit + +fi + +if [[ $version == "ros2" && $release =~ jammy ]]; then + + sudo apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 + echo "deb [arch=$(dpkg --print-architecture)] ${mirror_url}/ros2/ubuntu $(source /etc/os-release && echo $UBUNTU_CODENAME) main" | sudo tee /etc/apt/sources.list.d/ros2.list + + sudo apt update + sudo apt install -y ros-humble-desktop + sudo apt install -y ros-dev-tools + + sudo sh -c 'echo "source /opt/ros/humble/setup.bash" >> /root/.bashrc' + echo "source /opt/ros/humble/setup.bash" >> /home/orangepi/.bashrc + + source /opt/ros/humble/setup.bash + ros2 -h + + exit + +fi + +echo "Unsupported System!" diff --git a/external/packages/bsp/rk3588/usr/local/bin/test_camera.sh b/external/packages/bsp/rk3588/usr/local/bin/test_camera.sh index faafc18..2783907 100755 --- a/external/packages/bsp/rk3588/usr/local/bin/test_camera.sh +++ b/external/packages/bsp/rk3588/usr/local/bin/test_camera.sh @@ -8,4 +8,16 @@ echo "Start MIPI CSI Camera Preview!" export XDG_RUNTIME_DIR=/run/user/1000 -gst-launch-1.0 v4l2src device=/dev/video11 io-mode=4 ! queue ! video/x-raw,format=NV12,width=2112,height=1568,framerate=30/1 ! glimagesink + +if [[ -c /dev/video51 ]]; then + gst-launch-1.0 v4l2src device=/dev/video33 io-mode=4 ! video/x-raw,format=NV12,width=1080,height=720,framerate=15/1 ! xvimagesink > /dev/null 2>&1 & + gst-launch-1.0 v4l2src device=/dev/video42 io-mode=4 ! video/x-raw,format=NV12,width=720,height=576,framerate=15/1 ! xvimagesink > /dev/null 2>&1 & + gst-launch-1.0 v4l2src device=/dev/video51 io-mode=4 ! video/x-raw,format=NV12,width=640,height=480,framerate=15/1 ! xvimagesink > /dev/null 2>&1 +elif [[ -c /dev/video31 ]]; then + gst-launch-1.0 v4l2src device=/dev/video22 io-mode=4 ! video/x-raw,format=NV12,width=720,height=576,framerate=15/1 ! xvimagesink > /dev/null 2>&1 & + gst-launch-1.0 v4l2src device=/dev/video31 io-mode=4 ! video/x-raw,format=NV12,width=720,height=576,framerate=15/1 ! xvimagesink > /dev/null 2>&1 +elif [[ -c /dev/video11 ]]; then + gst-launch-1.0 v4l2src device=/dev/video11 io-mode=4 ! video/x-raw,format=NV12,width=2112,height=1568,framerate=15/1 ! xvimagesink > /dev/null 2>&1 +else + echo "Can not find camera!!!" +fi diff --git a/external/packages/bsp/rk3588/usr/local/bin/test_ros.sh b/external/packages/bsp/rk3588/usr/local/bin/test_ros.sh new file mode 100755 index 0000000..f38b35e --- /dev/null +++ b/external/packages/bsp/rk3588/usr/local/bin/test_ros.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +if [[ -f /opt/ros/noetic/setup.bash ]]; then + + source /opt/ros/noetic/setup.bash + roscore & + + sleep 5 + + rosrun turtlesim turtlesim_node & + rosrun turtlesim turtle_teleop_key + +fi + +if [[ -f /opt/ros/galactic/setup.bash ]]; then + + source /opt/ros/galactic/setup.bash + ros2 run demo_nodes_cpp talker & + ros2 run demo_nodes_py listener + +fi + +if [[ -f /opt/ros/humble/setup.bash ]]; then + + source /opt/ros/humble/setup.bash + ros2 run demo_nodes_cpp talker & + ros2 run demo_nodes_py listener + +fi diff --git a/external/packages/bsp/rk3588/usr/local/bin/vpu_debug.sh b/external/packages/bsp/rk3588/usr/local/bin/vpu_debug.sh index ab9439b..b42851c 100755 --- a/external/packages/bsp/rk3588/usr/local/bin/vpu_debug.sh +++ b/external/packages/bsp/rk3588/usr/local/bin/vpu_debug.sh @@ -1,3 +1,5 @@ #!/bin/bash sudo bash -c "echo 0x100 > /sys/module/rk_vcodec/parameters/mpp_dev_debug" +sudo dmesg -c > /dev/null +dmesg -w diff --git a/scripts/general.sh b/scripts/general.sh index 0eed17d..840430b 100755 --- a/scripts/general.sh +++ b/scripts/general.sh @@ -1835,15 +1835,18 @@ install_docker() { ;; esac - chroot "${SDCARD}" /bin/bash -c "curl -fsSL https://repo.huaweicloud.com/docker-ce/linux/${distributor_id}/gpg | apt-key add - > /dev/null 2>&1" - echo "deb [arch=${ARCH}] https://repo.huaweicloud.com/docker-ce/linux/${distributor_id} ${RELEASE} stable" > "${SDCARD}"/etc/apt/sources.list.d/docker.list + #mirror_url=https://mirrors.aliyun.com + mirror_url=https://repo.huaweicloud.com - chroot "${SDCARD}" /bin/bash -c "apt-get update > /dev/null 2>&1" - chroot "${SDCARD}" /bin/bash -c "apt-get install -y -qq docker-ce docker-ce-cli containerd.io > /dev/null 2>&1" - chroot "${SDCARD}" /bin/bash -c "sudo groupadd docker > /dev/null 2>&1" + chroot "${SDCARD}" /bin/bash -c "curl -fsSL ${mirror_url}/docker-ce/linux/${distributor_id}/gpg | apt-key add -" + echo "deb [arch=${ARCH}] ${mirror_url}/docker-ce/linux/${distributor_id} ${RELEASE} stable" > "${SDCARD}"/etc/apt/sources.list.d/docker.list + + chroot "${SDCARD}" /bin/bash -c "apt-get update" + chroot "${SDCARD}" /bin/bash -c "apt-get install -y -qq docker-ce docker-ce-cli containerd.io" + chroot "${SDCARD}" /bin/bash -c "sudo groupadd docker" chroot "${SDCARD}" /bin/bash -c "sudo usermod -aG docker ${OPI_USERNAME}" - run_on_sdcard "systemctl --no-reload disable docker.service > /dev/null 2>&1" + run_on_sdcard "systemctl --no-reload disable docker.service" }