v6.29

+ DietPi-Set_hardware | Bluetooth: Add support for ROCK Pi S onboard Bluetooth if Radxa repo is present, providing the firmware: #3365 (comment)
MichaIng · Mar 7, 2020 · 7e1feb7 · 7e1feb7
1 parent 727a5a7
commit 7e1feb7
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/dietpi/func/dietpi-set_hardware b/dietpi/func/dietpi-set_hardware
@@ -1065,7 +1065,7 @@ _EOF_
 			if (( $G_HW_MODEL < 10 )); then
 
 				systemctl disable --now hciuart 2> /dev/null
-				# - Enable dtoverlay only for onboard WiFi/BT models
+				# Enable dtoverlay only for onboard WiFi/BT models
 				if (( $HW_ONBOARD_WIFI )); then
 
 					G_CONFIG_INJECT 'dtoverlay=disable-bt' 'dtoverlay=disable-bt' /boot/config.txt
@@ -1100,7 +1100,7 @@ _EOF_
 			# Purge packages
 			if (( $G_DIETPI_INSTALL_STAGE >= 0 )); then
 
-				G_AGP bluez bluez-firmware pi-bluetooth
+				G_AGP bluez bluez-firmware pi-bluetooth rtl8723ds-firmware
 				G_AGA
 
 			fi
@@ -1113,7 +1113,7 @@ _EOF_
 			# Pre-Reqs
 			if (( $G_HW_MODEL < 10 )); then
 
-				# - Login console on ttyAMA0 must be disabled: https://github.com/MichaIng/DietPi/issues/2607#issuecomment-470523194
+				# Login console on ttyAMA0 must be disabled: https://github.com/MichaIng/DietPi/issues/2607#issuecomment-470523194
 				if systemctl -q is-active serial-getty@ttyAMA0; then
 
 					if G_WHIP_YESNO '[WARNING] A serial login console is currently active on ttyAMA0\n
@@ -1129,16 +1129,20 @@ Do you want to continue and disable the serial login console?'; then
 
 				fi
 
-				# - Remove dtoverlay
+				# Remove dtoverlay
 				sed -i '/^[[:blank:]]*dtoverlay=disable-bt/d' /boot/config.txt
 				dtoverlay -r disable-bt # In case loaded on same session
 
 				G_AG_CHECK_INSTALL_PREREQ pi-bluetooth
 
 			else
 
-				# bluez-firmware: BCM203x dongles: https://packages.debian.org/stretch/bluez-firmware
-				G_AG_CHECK_INSTALL_PREREQ bluez bluez-firmware
+				# ROCK Pi S: https://wiki.radxa.com/RockpiS/Debian#Bluetooth
+				local rockpis
+				(( $G_HW_MODEL == 73 )) && apt-cache show rtl8723ds-firmware && rockpis=rtl8723ds-firmware
+
+				# bluez-firmware: BCM203x dongles: https://packages.debian.org/bluez-firmware
+				G_AG_CHECK_INSTALL_PREREQ bluez bluez-firmware $rockpis
 
 			fi