brain-hackers_pepepper-mirror/brain-config
1
0
Fork 0
mirror of https://github.com/brain-hackers/brain-config.git synced 2025-01-03 10:00:07 +09:00
Code Issues Projects Releases Wiki Activity

Update camera switching for bullseye

Browse Source
This commit is contained in:
Simon Long 2021-08-27 16:14:39 +01:00
parent e8d0a860ec
commit 64d5c2c25d
2 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
raspi-config (20210827) bullseye; urgency=medium
* Add switching for new camera detection in firmware
-- Simon Long <simon@raspberrypi.com> Fri, 27 Aug 2021 16:13:49 +0100
raspi-config (20210816) bullseye; urgency=medium raspi-config (20210816) bullseye; urgency=medium
* Enable xcompmgr with full KMS as well as fKMS on all platforms * Enable xcompmgr with full KMS as well as fKMS on all platforms

43
raspi-config
View File

@ -1644,16 +1644,29 @@ EOF
} }
get_camera() { get_camera() {
CAM=$(get_config_var start_x $CONFIG) if [ $(deb_ver) -le 10 ]; then
if [ $CAM -eq 1 ]; then CAM=$(get_config_var start_x $CONFIG)
echo 0 if [ $CAM -eq 1 ]; then
echo 0
else
echo 1
fi
else else
echo 1 if grep -q camera_auto_detect $CONFIG ; then
CAM=$(get_config_var camera_auto_detect $CONFIG)
if [ $CAM -eq 1 ]; then
echo 0
else
echo 1
fi
else
echo 0
fi
fi fi
} }
do_camera() { do_camera() {
if [ ! -e /boot/start_x.elf ]; then if [ $(deb_ver) -le 10 ] && [ ! -e /boot/start_x.elf ]; then
whiptail --msgbox "Your firmware appears to be out of date (no start_x.elf). Please update" 20 60 2 whiptail --msgbox "Your firmware appears to be out of date (no start_x.elf). Please update" 20 60 2
return 1 return 1
fi fi
@ -1676,15 +1689,23 @@ do_camera() {
ASK_TO_REBOOT=1 ASK_TO_REBOOT=1
fi fi
if [ $RET -eq 0 ]; then if [ $RET -eq 0 ]; then
set_config_var start_x 1 $CONFIG if [ $(deb_ver) -le 10 ] ; then
CUR_GPU_MEM=$(get_config_var gpu_mem $CONFIG) set_config_var start_x 1 $CONFIG
if [ -z "$CUR_GPU_MEM" ] || [ "$CUR_GPU_MEM" -lt 128 ]; then CUR_GPU_MEM=$(get_config_var gpu_mem $CONFIG)
set_config_var gpu_mem 128 $CONFIG if [ -z "$CUR_GPU_MEM" ] || [ "$CUR_GPU_MEM" -lt 128 ]; then
set_config_var gpu_mem 128 $CONFIG
fi
else
set_config_var camera_auto_detect 1 $CONFIG
fi fi
STATUS=enabled STATUS=enabled
elif [ $RET -eq 1 ]; then elif [ $RET -eq 1 ]; then
set_config_var start_x 0 $CONFIG if [ $(deb_ver) -le 10 ] ; then
sed $CONFIG -i -e "s/^start_file/#start_file/" set_config_var start_x 0 $CONFIG
sed $CONFIG -i -e "s/^start_file/#start_file/"
else
set_config_var camera_auto_detect 0 $CONFIG
fi
STATUS=disabled STATUS=disabled
else else
return $RET return $RET