diff --git a/external/config/boards/orangepi5.conf b/external/config/boards/orangepi5.conf index da7ee50..233f487 100644 --- a/external/config/boards/orangepi5.conf +++ b/external/config/boards/orangepi5.conf @@ -12,4 +12,4 @@ BOOT_SUPPORT_SPI="yes" SKIP_BOOTSPLASH="yes" # Skip boot splash patch, conflicts with CONFIG_VT=yes DISTRIB_TYPE_LEGACY="bullseye focal jammy" BOOTFS_TYPE="fat" -REVISION="1.0.6" +REVISION="1.0.8" diff --git a/external/config/cli/bullseye/main/packages b/external/config/cli/bullseye/main/packages index c0080f8..690d68c 100644 --- a/external/config/cli/bullseye/main/packages +++ b/external/config/cli/bullseye/main/packages @@ -18,3 +18,4 @@ sysfsutils toilet u-boot-tools usbutils +python diff --git a/external/config/cli/focal/main/packages b/external/config/cli/focal/main/packages index c0080f8..690d68c 100644 --- a/external/config/cli/focal/main/packages +++ b/external/config/cli/focal/main/packages @@ -18,3 +18,4 @@ sysfsutils toilet u-boot-tools usbutils +python diff --git a/external/config/cli/jammy/main/packages b/external/config/cli/jammy/main/packages index c0080f8..bfd7121 100755 --- a/external/config/cli/jammy/main/packages +++ b/external/config/cli/jammy/main/packages @@ -18,3 +18,4 @@ sysfsutils toilet u-boot-tools usbutils +python-is-python3 diff --git a/external/config/kernel/linux-rockchip-rk3588-legacy.config b/external/config/kernel/linux-rockchip-rk3588-legacy.config index 925430a..057d2e7 100644 --- a/external/config/kernel/linux-rockchip-rk3588-legacy.config +++ b/external/config/kernel/linux-rockchip-rk3588-legacy.config @@ -6276,7 +6276,7 @@ CONFIG_STAGING=y # # Android # -# CONFIG_ASHMEM is not set +CONFIG_ASHMEM=y # CONFIG_DEBUG_KINFO is not set # CONFIG_ION is not set CONFIG_FIQ_DEBUGGER=y @@ -7130,8 +7130,11 @@ CONFIG_ARM_PMU=y # Android # CONFIG_ANDROID=y -# CONFIG_ANDROID_BINDER_IPC is not set -# CONFIG_ANDROID_DEBUG_SYMBOLS is not set +CONFIG_ANDROID_BINDER_IPC=y +# CONFIG_ANDROID_BINDERFS is not set +CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder" +# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set +CONFIG_ANDROID_DEBUG_SYMBOLS=y # CONFIG_ANDROID_VENDOR_HOOKS is not set # CONFIG_ANDROID_KABI_RESERVE is not set # CONFIG_ANDROID_VENDOR_OEM_DATA is not set diff --git a/external/config/optional/families/rockchip-rk3588/_config/desktop/bullseye/environments/xfce/config_base/packages b/external/config/optional/families/rockchip-rk3588/_config/desktop/bullseye/environments/xfce/config_base/packages index d70138b..9f97b97 100644 --- a/external/config/optional/families/rockchip-rk3588/_config/desktop/bullseye/environments/xfce/config_base/packages +++ b/external/config/optional/families/rockchip-rk3588/_config/desktop/bullseye/environments/xfce/config_base/packages @@ -266,3 +266,7 @@ liblua5.2-0 vlc gparted clinfo +dkms +fakeroot +debhelper +xinput 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 index ab8b568..0e0a75c 100644 --- 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 @@ -5,6 +5,30 @@ gstreamer1.0-tools gstreamer1.0-alsa gstreamer1.0-plugins-base-apps qtmultimedia5-examples +libglib2.0-doc +libgraphene-1.0-0 +libegl-dev libegl1-mesa-dev +libgl-dev libgl1-mesa-dev +libgles-dev +libgles1 +libgles2-mesa-dev +libglvnd-dev +libglx-dev +libopengl-dev +libopengl0 +liborc-0.4-dev +liborc-0.4-dev-bin +libpthread-stubs0-dev +libx11-dev +libx11-xcb-dev +libxau-dev +libxcb1-dev +libxdmcp-dev +x11proto-core-dev +x11proto-dev +xorg-sgml-doctools +xtrans-dev +libqt5x11extras5 libdw1 libdw-dev libelf-dev liblzma-dev @@ -50,3 +74,8 @@ fonts-noto-cjk fcitx-frontend-qt5 fcitx-frontend-gtk2 gparted +cheese +dkms +fakeroot +debhelper +xinput diff --git a/external/config/optional/families/rockchip-rk3588/_config/desktop/jammy/environments/xfce/config_base/packages b/external/config/optional/families/rockchip-rk3588/_config/desktop/jammy/environments/xfce/config_base/packages index 154898e..dc03e08 100644 --- a/external/config/optional/families/rockchip-rk3588/_config/desktop/jammy/environments/xfce/config_base/packages +++ b/external/config/optional/families/rockchip-rk3588/_config/desktop/jammy/environments/xfce/config_base/packages @@ -256,3 +256,18 @@ python2 clinfo fonts-noto-cjk gnome-user-docs-zh-hans +dkms +fakeroot +debhelper +fcitx5-frontend-gtk2 +fcitx5-frontend-qt5 +fcitx5-frontend-gtk4 +fcitx5-chinese-addons +fcitx5-module-cloudpinyin +language-pack-gnome-zh-hans +fcitx5 fonts-noto-cjk-extra +fcitx5-frontend-gtk3 +language-pack-zh-hans +fcitx5-data +fcitx5-config-qt +xinput diff --git a/external/config/sources/families/include/rk3588_gpu_vpu.inc b/external/config/sources/families/include/rk3588_gpu_vpu.inc index d273d32..5286e07 100755 --- a/external/config/sources/families/include/rk3588_gpu_vpu.inc +++ b/external/config/sources/families/include/rk3588_gpu_vpu.inc @@ -271,29 +271,37 @@ rk3588_gpu_vpu_tweaks() 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" + 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/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/gstreamer/libgstreamer1.0-0_1.16.3-0ubuntu1.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gstreamer/libgstreamer1.0-dev_1.16.3-0ubuntu1.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gstreamer/gir1.2-gstreamer-1.0_1.16.3-0ubuntu1.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gstreamer/gstreamer1.0-tools_1.16.3-0ubuntu1.1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gstreamer/gstreamer1.0-doc_1.16.3-0ubuntu1.1_all.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-base1.0/libgstreamer-gl1.0-0_1.16.3-0ubuntu1.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.16.3-0ubuntu1.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-base1.0/gstreamer1.0-alsa_1.16.3-0ubuntu1.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-base1.0/gstreamer1.0-plugins-base_1.16.3-0ubuntu1.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-base1.0/gstreamer1.0-plugins-base-apps_1.16.3-0ubuntu1.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-base1.0/gstreamer1.0-x_1.16.3-0ubuntu1.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-base1.0/gstreamer1.0-gl_1.16.3-0ubuntu1.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-base1.0/libgstreamer-plugins-base1.0-0_1.16.3-0ubuntu1.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-base1.0/libgstreamer-plugins-base1.0-dev_1.16.3-0ubuntu1.1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-base1.0/gstreamer1.0-plugins-base-doc_1.16.3-0ubuntu1.1_all.deb" + + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-good1.0/gstreamer1.0-plugins-good_1.16.3-0ubuntu1.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-good1.0/gstreamer1.0-pulseaudio_1.16.3-0ubuntu1.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-good1.0/gstreamer1.0-gtk3_1.16.3-0ubuntu1.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-good1.0/gstreamer1.0-qt5_1.16.3-0ubuntu1.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-good1.0/libgstreamer-plugins-good1.0-0_1.16.3-0ubuntu1.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_focal/gst-plugins-good1.0/libgstreamer-plugins-good1.0-dev_1.16.3-0ubuntu1.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" @@ -314,7 +322,7 @@ rk3588_gpu_vpu_tweaks() 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/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" @@ -323,8 +331,6 @@ rk3588_gpu_vpu_tweaks() 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" diff --git a/external/config/sources/families/include/rockchip64_common.inc b/external/config/sources/families/include/rockchip64_common.inc index 01959af..7aafb89 100644 --- a/external/config/sources/families/include/rockchip64_common.inc +++ b/external/config/sources/families/include/rockchip64_common.inc @@ -16,7 +16,7 @@ BOOTBRANCH="branch:v2020.10-rockchip64" PACKAGE_LIST_FAMILY="ethtool can-utils" if [[ $RELEASE == "jammy" ]]; then - PACKAGE_LIST_DESKTOP_FAMILY="fcitx fonts-wqy-zenhei xfce4-volumed" + PACKAGE_LIST_DESKTOP_FAMILY="fcitx5 fonts-wqy-zenhei xfce4-volumed" else PACKAGE_LIST_DESKTOP_FAMILY="fcitx fonts-wqy-zenhei" fi diff --git a/external/config/sources/families/rockchip-rk3588.conf b/external/config/sources/families/rockchip-rk3588.conf index a11d4cb..83c003d 100644 --- a/external/config/sources/families/rockchip-rk3588.conf +++ b/external/config/sources/families/rockchip-rk3588.conf @@ -60,7 +60,8 @@ family_tweaks_s() { sed "s/^SIZE=.*/SIZE=200M/" -i "${SDCARD}"/etc/default/orangepi-ramlog chroot "${SDCARD}" /bin/bash -c "ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime" chroot "${SDCARD}" /bin/bash -c "dpkg-reconfigure -f noninteractive tzdata" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 - chroot $SDCARD /bin/bash -c "apt-get -y -qq install lm-sensors usb-modeswitch" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 + + chroot $SDCARD /bin/bash -c "apt-get -y -qq install lm-sensors usb-modeswitch tree" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 install_wiringop install_docker diff --git a/external/packages/bsp/rk3588/usr/local/bin/install_ros.sh b/external/packages/bsp/rk3588/usr/local/bin/install_ros.sh index 42703dd..e7c9988 100755 --- a/external/packages/bsp/rk3588/usr/local/bin/install_ros.sh +++ b/external/packages/bsp/rk3588/usr/local/bin/install_ros.sh @@ -3,7 +3,7 @@ #mirror_url=http://mirrors.ustc.edu.cn mirror_url=https://repo.huaweicloud.com -if [[ -n $1 ]]; then +if [[ -n $1 && $1 =~ ros1|ros2 ]]; then version=$1 else echo "usage: install_ros.sh ros1/ros2" diff --git a/external/packages/bsp/rk3588/usr/local/bin/set_lcd_rotate.sh b/external/packages/bsp/rk3588/usr/local/bin/set_lcd_rotate.sh new file mode 100755 index 0000000..e63d48e --- /dev/null +++ b/external/packages/bsp/rk3588/usr/local/bin/set_lcd_rotate.sh @@ -0,0 +1,87 @@ +#!/bin/bash + +if [[ -n $1 && $1 =~ left|right|inverted|none ]]; then + type=$1 +else + echo "usage: set_lcd_rotate.sh [left|right|inverted|none]" + exit +fi + +user=$(cat /etc/lightdm/lightdm.conf.d/22-orangepi-autologin.conf | grep "autologin-user=" | cut -d "=" -f 2) +#echo $user + +if [[ $user == "root" ]]; then + + lcd_num=$(sudo xinput | grep "Goodix Capacitive TouchScreen" | grep "pointer" | wc -l) + [[ $lcd_num == 1 ]] && id=$(sudo xinput | grep "Goodix Capacitive TouchScreen" | grep "pointer" | cut -d '=' -f2 | cut -d " " -f 1 | cut -d "[" -f 1) + + if [[ $lcd_num == 2 ]]; then + + id1=$(sudo xinput | grep "Goodix Capacitive TouchScreen" | grep "pointer" | head -1 | cut -d "=" -f2 | cut -d "[" -f1) + id2=$(sudo xinput | grep "Goodix Capacitive TouchScreen" | grep "pointer" | tail -1 | cut -d "=" -f2 | cut -d "[" -f1) + #echo "id1 = $id1" + #echo "id2 = $id2" + + fi + +fi + +if [[ $user != "root" ]]; then + + lcd_num=$(xinput | grep "Goodix Capacitive TouchScreen" | grep "pointer" | wc -l) + [[ $lcd_num == 1 ]] && id=$(xinput | grep "Goodix Capacitive TouchScreen" | grep "pointer" | cut -d '=' -f2 | cut -d " " -f 1 | cut -d "[" -f 1) + + if [[ $lcd_num == 2 ]]; then + + id1=$(xinput | grep "Goodix Capacitive TouchScreen" | grep "pointer" | head -1 | cut -d "=" -f2 | cut -d "[" -f1) + id2=$(xinput | grep "Goodix Capacitive TouchScreen" | grep "pointer" | tail -1 | cut -d "=" -f2 | cut -d "[" -f1) + #echo "id1 = $id1" + #echo "id2 = $id2" + + fi + +fi + +#echo $lcd_num +#echo $id + +case $1 in +left) + rotate=3 + matrix="0 -1 1 1 0 0 0 0 1" + ;; +right) + rotate=1 + matrix="0 1 0 -1 0 1 0 0 1" + ;; +inverted) + rotate=2 + matrix="-1 0 1 0 -1 1 0 0 1" + ;; +none) + rotate=0 + matrix="1 0 0 0 1 0 0 0 1" + ;; +esac + +[[ -f /etc/profile.d/lcd.sh ]] && sudo rm /etc/profile.d/lcd.sh +sudo bash -c "echo '#!/bin/bash' >> /etc/profile.d/lcd.sh" +sudo bash -c "echo ' ' >> /etc/profile.d/lcd.sh" +sudo bash -c "echo '[[ \$XDG_SESSION_TYPE == x11 ]] && \' >> /etc/profile.d/lcd.sh" +if [[ $lcd_num == 2 ]]; then +sudo bash -c "echo xinput set-prop $id1 \'Coordinate Transformation Matrix\' ${matrix} >> /etc/profile.d/lcd.sh" +sudo bash -c "echo '[[ \$XDG_SESSION_TYPE == x11 ]] && \' >> /etc/profile.d/lcd.sh" +sudo bash -c "echo xinput set-prop $id2 \'Coordinate Transformation Matrix\' ${matrix} >> /etc/profile.d/lcd.sh" +else +sudo bash -c "echo xinput set-prop $id \'Coordinate Transformation Matrix\' ${matrix} >> /etc/profile.d/lcd.sh" +fi + +#xrandr -o $1 +#sed -i '/xrandr -o/d' ~/.bashrc +#echo "xrandr -o $1" >> ~/.bashrc + +sudo sed -i '/extraargs=fbcon=rotate/d' /boot/orangepiEnv.txt +sudo bash -c "echo extraargs=fbcon=rotate:${rotate} >> /boot/orangepiEnv.txt" +sudo sync + +sudo reboot 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 2783907..979cc0a 100755 --- a/external/packages/bsp/rk3588/usr/local/bin/test_camera.sh +++ b/external/packages/bsp/rk3588/usr/local/bin/test_camera.sh @@ -10,14 +10,14 @@ export XDG_RUNTIME_DIR=/run/user/1000 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/video33 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/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 + gst-launch-1.0 v4l2src device=/dev/video51 io-mode=4 ! video/x-raw,format=NV12,width=720,height=576,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 + gst-launch-1.0 v4l2src device=/dev/video11 io-mode=4 ! video/x-raw,format=NV12,width=720,height=576,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_dec_mpv.sh b/external/packages/bsp/rk3588/usr/local/bin/test_dec_mpv.sh index 6ab7555..24db468 100755 --- a/external/packages/bsp/rk3588/usr/local/bin/test_dec_mpv.sh +++ b/external/packages/bsp/rk3588/usr/local/bin/test_dec_mpv.sh @@ -5,4 +5,7 @@ export DISPLAY=:0.0 #export GST_DEBUG_FILE=/tmp/2.txt # xv vo -mpv --hwdec=rkmpp --vd-lavc-software-fallback=no --vo=xv /usr/local/test.mp4 +while true +do + mpv --hwdec=rkmpp --vd-lavc-software-fallback=no --vo=xv /usr/local/test.mp4 +done diff --git a/external/packages/bsp/rk3588/usr/local/bin/test_gst.sh b/external/packages/bsp/rk3588/usr/local/bin/test_gst.sh new file mode 100755 index 0000000..36bd05b --- /dev/null +++ b/external/packages/bsp/rk3588/usr/local/bin/test_gst.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +export DISPLAY=:0.0 + +if [[ -z $1 ]]; then + video=/usr/local/test.mp4 +else + video=$1 +fi + +while true +do + gst-play-1.0 $video --videosink=xvimagesink +done diff --git a/external/packages/bsp/rk3588/usr/local/bin/test_record.sh b/external/packages/bsp/rk3588/usr/local/bin/test_record.sh new file mode 100755 index 0000000..bc7d131 --- /dev/null +++ b/external/packages/bsp/rk3588/usr/local/bin/test_record.sh @@ -0,0 +1,43 @@ +#!/bin/bash + +if [[ -n $1 && $1 =~ main|headset ]]; then + type=$1 +else + echo "usage: test_record.sh main/headset" + exit +fi + +card=$(aplay -l | grep "es8388" | cut -d ':' -f 1 | cut -d ' ' -f 2) + +if [[ $type == "main" ]]; then + + tinymix -D 2 3 4 + tinymix -D 2 4 2 + tinymix -D 2 14 192 + tinymix -D 2 16 0 + tinymix -D 2 17 0 + tinymix -D 2 31 1 + tinymix -D 2 32 1 + tinymix -D 2 33 1 + +else + + tinymix -D 2 3 2 + tinymix -D 2 4 1 + tinymix -D 2 14 192 + tinymix -D 2 16 0 + tinymix -D 2 17 0 + tinymix -D 2 31 0 + tinymix -D 2 32 0 + tinymix -D 2 33 0 + +fi + + +echo "Start recording: /tmp/test.wav" +arecord -D hw:${card},0 -d 5 -f cd -t wav /tmp/test.wav + +echo "Start playing" +aplay /tmp/test.wav -D hw:1,0 +aplay /tmp/test.wav -D hw:2,0 +#aplay /tmp/test.wav -D hw:0,0 diff --git a/scripts/distributions.sh b/scripts/distributions.sh index e7defa3..5e19ac8 100755 --- a/scripts/distributions.sh +++ b/scripts/distributions.sh @@ -334,7 +334,7 @@ POST_INSTALL_KERNEL_DEBS # install board support packages if [[ "${REPOSITORY_INSTALL}" != *bsp* ]]; then - install_deb_chroot "${DEB_STORAGE}/$RELEASE/${BSP_CLI_PACKAGE_FULLNAME}.deb" | tee "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 + install_deb_chroot "${DEB_STORAGE}/$RELEASE/${BSP_CLI_PACKAGE_FULLNAME}.deb" else install_deb_chroot "${DEB_ORANGEPI}/$RELEASE/${CHOSEN_ROOTFS}_${BSP_CLI_PACKAGE_FULLNAME}.deb" "orangepi" fi