v142

+ RPi Bluetooth fix : https://github.com/Fourdee/DietPi/issues/693

CHANGELOG.txt

@@ -9,12 +9,12 @@ DietPi-Config | Audio > Sound card: Added support for selecting USB-DAC sound ca
 DietPi-Software | MySQL/MariaDB: Data store is now located in the DietPi User data location (eg: /mnt/dietpi_userdata/mysql). Should offer improved performance for USB drive users: https://github.com/Fourdee/DietPi/issues/672
 
 Bug fixes:
+General | RPi 3 onboard Bluetooth is now functional: https://github.com/Fourdee/DietPi/issues/693
 General | Odroid C2: Resolved an issue with deb-multimedia repo failing GPG key: https://github.com/Fourdee/DietPi/issues/677
 General | Resolved an issue where access to /mnt/usb_1 would hang the program/command, when no USB drive was attached: https://github.com/Fourdee/DietPi/issues/684
 DietPi-Automation | Resolved an issue with automated 1st run installation would hang on Odroid C2, during patch stage: https://github.com/Fourdee/DietPi/issues/689
 
 RPi Stretch:
-RPi 3 onboard Bluetooth is now functional: https://github.com/Fourdee/DietPi/issues/475
 
 -----------------------------------------------------------------------------------------------------------
 

PREP_SYSTEM_FOR_DIETPI.sh

@@ -131,6 +131,8 @@ apt-get install rfkill
 
 #??? bluetooth if onboard device
 apt-get install -y bluetooth
+#??? RPi - bluetooth/firmware for RPi 3
+apt-get install -y pi-bluetooth
 
 #??? Non-ARMbian images only: firmware
 apt-get install -y firmware-realtek firmware-ralink firmware-brcm80211 firmware-atheros -y --no-install-recommends

dietpi/func/dietpi-set_hardware

@@ -848,22 +848,13 @@ _EOF_
 			# + RPi 3
 			if (( $HW_MODEL == 3 )); then
 
-				cat << _EOF_ > /lib/systemd/system/hciuart.service
-[Unit]
-Description=Configure Bluetooth Modems connected by UART
-ConditionPathIsDirectory=/proc/device-tree/soc/gpio@7e200000/bt_pins
-Before=bluetooth.service
-After=dev-ttyAMA0.device
+				#pi-bluetooth contains hciuart service and also pulls in firmware: https://github.com/Fourdee/DietPi/issues/693
+				if (( ! $(dpkg --get-selections | grep -ci -m1 '^pi-bluetooth') )); then
 
-[Service]
-Type=forking
-ExecStart=/usr/bin/hciattach /dev/ttyAMA0 bcm43xx 921600 noflow -
+					apt-get install -y pi-bluetooth
 
-[Install]
-WantedBy=multi-user.target
-_EOF_
+				fi
 
-				systemctl daemon-reload
 				systemctl enable hciuart
 
 				#Start service again, if it fails: https://github.com/Fourdee/DietPi/issues/376#issuecomment-230149754

dietpi/patch_file

@@ -2138,26 +2138,10 @@ _EOF_
 
 		fi
 		#-------------------------------------------------------------------------------
-		#Stretch RPi 3 Bluetooth fix:
-		if (( $DISTRO == 4 && $HW_MODEL == 3 )); then
-
-			cat << _EOF_ > /lib/systemd/system/hciuart.service
-[Unit]
-Description=Configure Bluetooth Modems connected by UART
-ConditionPathIsDirectory=/proc/device-tree/soc/gpio@7e200000/bt_pins
-Before=bluetooth.service
-After=dev-ttyAMA0.device
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/hciattach /dev/ttyAMA0 bcm43xx 921600 noflow -
-
-[Install]
-WantedBy=multi-user.target
-_EOF_
+		#RPi 3 Bluetooth packages missing: https://github.com/Fourdee/DietPi/issues/693
+		if (( $HW_MODEL < 10 )); then
 
-			systemctl daemon-reload
-			systemctl enable hciuart
+			apt-get install -y pi-bluetooth --reinstall
 
 		fi
 		#-------------------------------------------------------------------------------