From 2797edb0f724633a09d951121ef72c57f8f339ec Mon Sep 17 00:00:00 2001
From: tueddy <d.carstensen@pixelplanet.de>
Date: Sun, 11 Jun 2023 22:40:22 +0200
Subject: [PATCH 1/3] Bluetooth configuration tab in web-interface

---
 html/locales/de.json           | 22 ++++++++++++++
 html/locales/en.json           | 22 ++++++++++++++
 html/management.html           | 52 ++++++++++++++++++++++++++++++++++
 src/Bluetooth.cpp              | 11 +++++--
 src/Web.cpp                    | 19 ++++++++++++-
 src/settings-override.h.sample |  1 -
 src/settings.h                 |  1 -
 7 files changed, 122 insertions(+), 6 deletions(-)

diff --git a/html/locales/de.json b/html/locales/de.json
index 7235f5c6..f8edc57f 100644
--- a/html/locales/de.json
+++ b/html/locales/de.json
@@ -18,6 +18,7 @@
         "wifi": "WLAN",
         "mqtt": "MQTT",
         "ftp": "FTP",
+        "bluetooth": "Bluetooth",
         "general": "Allgemein",
         "tools": "Tools",
         "forum": "Forum"
@@ -204,6 +205,27 @@
             "button": "FTP-Server starten"
         }
     },
+    "bt": {
+        "sink": {
+            "title": "ESPuino als Bluetooth Lautsprecher",
+            "desc": "ESPuino wird als Bluetooth-Lautsprecher gestartet. Nach dem Wechsel in diesen Modus wird die Weboberfläche nicht länger erreichbar sein.",
+            "button": "Als Bluetooth Lautsprecher starten"
+        },
+        "source": {
+            "configtitle": "Bluetooth Kopfhörer Einstellungen",
+            "title": "Mit Bluetooth Kopfhörer verbinden",
+            "desc": "Das Gerät verbindet sich mit dem angegebenen Bluetooth Kopfhörer. Nach dem Wechsel in diesen Modus wird die Weboberfläche nicht länger erreichbar sein.",  
+            "button": "Im Kophörer-Modus starten"
+        },
+        "device": {
+            "title": "Bluetooth-Gerät (Kopfhörer)",
+            "placeholder": "z.B. My POGS Wireless Headphone"
+        },
+        "pincode": {
+            "title": "Pairing PIN-Code",
+            "placeholder": "z.B. 0000"
+        }
+    },
     "general": {
         "volume": {
             "title": "Lautstärke",
diff --git a/html/locales/en.json b/html/locales/en.json
index e4faaa82..0d95e823 100644
--- a/html/locales/en.json
+++ b/html/locales/en.json
@@ -18,6 +18,7 @@
         "wifi": "WiFi",
         "mqtt": "MQTT",
         "ftp": "FTP",
+        "bluetooth": "Bluetooth",
         "general": "General",
         "tools": "Tools",
         "forum": "Forum"
@@ -204,6 +205,27 @@
             "button": "Start FTP-server"
         }
     },
+    "bt": {
+        "sink": {
+            "title": "ESPuino as Bluetooth speaker",
+            "desc": "ESPuino is started as a Bluetooth speaker. After switching to this mode, the web interface will no longer be accessible.",
+            "button": "Start as Bluetooth speaker"
+        },
+        "source": {
+            "configtitle": "Bluetooth headphone settings",
+            "title": "Connect with Bluetooth headphone",
+            "desc": "The device connects to the specified Bluetooth headset. After switching to this mode, the web interface will no longer be accessible.",  
+            "button": "Start in headphone mode"
+        },
+        "device": {
+            "title": "Bluetooth device (headphone)",
+            "placeholder": "e.g. My POGS Wireless Headphone"
+        },
+        "pincode": {
+            "title": "Pairing PIN-Code",
+            "placeholder": "e.g. 0000"
+        }
+    },
     "general": {
         "volume": {
             "title": "Volume",
diff --git a/html/management.html b/html/management.html
index 10a04c79..921ca616 100644
--- a/html/management.html
+++ b/html/management.html
@@ -166,6 +166,7 @@
 			<a class="nav-item nav-link" id="nav-wifi-tab" data-toggle="tab" href="#nav-wifi" role="tab" aria-controls="nav-wifi" aria-selected="false"><i class="fas fa-wifi"></i><span class=".d-sm-none .d-md-block"><span data-i18n="nav.wifi">WiFi</span></a>
 			%SHOW_MQTT_TAB%
 			%SHOW_FTP_TAB%
+			%SHOW_BLUETOOTH_TAB%
 			<a class="nav-item nav-link" id="nav-general-tab" data-toggle="tab" href="#nav-general" role="tab" aria-controls="nav-general" aria-selected="false"><i class="fas fa-sliders-h"></i><span data-i18n="nav.general">General</span></a>
 			<a class="nav-item nav-link" id="nav-tools-tab" data-toggle="tab" href="#nav-tools" role="tab" aria-controls="nav-tools" aria-selected="false"><i class="fas fa-wrench"></i><span data-i18n="nav.tools">Tools</span></a>
 			<a class="nav-item nav-link" id="nav-forum-tab" data-toggle="tab" href="#nav-forum" role="tab" aria-controls="nav-forum" aria-selected="false"><i class="fas fa-comment"></i><span class=".d-sm-none .d-md-block"><span data-i18n="nav.forum">Forum</span></span></a>
@@ -487,6 +488,45 @@
 			</div>
 		</div>
 	</div>
+	<div class="tab-pane fade" id="nav-bt" role="tabpanel" aria-labelledby="nav-bt-tab">
+		<div class="container" id="btConfig">
+			<form action="#btConfig" method="POST" onsubmit="btSettings('btConfig'); return false">
+				<div class="form-group col-md-12">
+					<legend data-i18n="bt.source.configtitle"></legend>
+					<label for="btDeviceName" data-i18n="[prepend]bt.device.title">:</label>
+					<input type="text" class="form-control" id="btDeviceName"
+						data-i18n="[placeholder]bt.device.placeholder" name="btDeviceName" value="%BT_DEVICE_NAME%"><br>
+					<label for="btPinCode" data-i18n="[prepend]bt.pincode.title">:</label>
+					<input type="text" class="form-control" id="btPinCode"
+						data-i18n="[placeholder]bt.pincode.placeholder" name="btPinCode" value="%BT_PINCODE%">
+				</div>
+				<br>
+				<div class="text-center">
+				<button type="submit" class="btn btn-primary" data-i18n="submit"></button> 
+				</div>
+			</form><br>
+			<div class="container" id="btStartSource">
+				<div class="form-group col-md-12">
+					<legend data-i18n="bt.source.title"></legend>
+					<div data-i18n="bt.source.desc"></div>
+					<br>
+					<div class="text-center">
+						<button type="button" class="btn btn-primary" onclick="sendControl(141)" data-i18n="bt.source.button"></button>
+					</div>
+				</div>
+			</div>
+			</div><br><br>
+		<div class="container" id="btStartSink">
+			<div class="form-group col-md-12">
+				<legend data-i18n="bt.sink.title"></legend>
+				<div data-i18n="bt.sink.desc"></div>
+				<br>
+				<div class="text-center">
+					<button type="button" class="btn btn-primary" onclick="sendControl(140)" data-i18n="bt.sink.button"></button>
+				</div>
+			</div>
+		</div>
+	</div>
 	<div class="tab-pane fade" id="nav-general" role="tabpanel" aria-labelledby="nav-general-tab">
 		<div class="container" id="generalConfig">
 
@@ -1460,6 +1500,18 @@
 		socket.send(myJSON);
 	}
 
+	function btSettings(clickedId) {
+		lastIdclicked = clickedId;
+		var myObj = {
+			"bluetooth": {
+				deviceName: document.getElementById('btDeviceName').value,
+				pinCode: document.getElementById('btPinCode').value
+			}
+		};
+		var myJSON = JSON.stringify(myObj);
+		socket.send(myJSON);
+	}
+
 	function removeTrSlash(str) {
 		if (str.substr(-1) === '/') {
 			return str.substr(0, str.length - 1);
diff --git a/src/Bluetooth.cpp b/src/Bluetooth.cpp
index 354d5b9e..4d4febb9 100644
--- a/src/Bluetooth.cpp
+++ b/src/Bluetooth.cpp
@@ -207,15 +207,20 @@ void Bluetooth_Init(void) {
 			//a2dp_source->set_task_core(1);            // task core
 			//a2dp_source->set_nvs_init(true);          // erase/initialize NVS
 			//a2dp_source->set_ssp_enabled(true);       // enable secure simple pairing
-			//a2dp_source->set_pin_code("0000");        // set pin code if needed, see https://forum.espuino.de/t/neues-feature-bluetooth-kopfhoerer/1293/30
 
+			// pairing pin-code, see https://forum.espuino.de/t/neues-feature-bluetooth-kopfhoerer/1293/30
+			String btPinCode = gPrefsSettings.getString("btPinCode", "");
+			if (btPinCode != "") {
+				a2dp_source->set_ssp_enabled(true);
+				a2dp_source->set_pin_code(btPinCode.c_str()); 
+			}
 			// start bluetooth source
 			a2dp_source->set_ssid_callback(scan_bluetooth_device_callback);
 			a2dp_source->start(get_data_channels);
 			// get device name
-			btDeviceName = nameBluetoothSourceDevice;
+			btDeviceName = "";
 			if (gPrefsSettings.isKey("btDeviceName")) {
-				btDeviceName = gPrefsSettings.getString("btDeviceName", nameBluetoothSourceDevice);
+				btDeviceName = gPrefsSettings.getString("btDeviceName", "");
 			}
 			Log_Printf(LOGLEVEL_INFO, "Bluetooth source started, connect to device: '%s'", (btDeviceName == "") ? "connect to first device found" : btDeviceName.c_str());
 			// connect events after startup
diff --git a/src/Web.cpp b/src/Web.cpp
index 537a3aea..a04efe57 100644
--- a/src/Web.cpp
+++ b/src/Web.cpp
@@ -39,6 +39,7 @@ typedef struct {
 
 const char mqttTab[] = "<a class=\"nav-item nav-link\" id=\"nav-mqtt-tab\" data-toggle=\"tab\" href=\"#nav-mqtt\" role=\"tab\" aria-controls=\"nav-mqtt\" aria-selected=\"false\"><i class=\"fas fa-network-wired\"></i><span data-i18n=\"nav.mqtt\"></span></a>";
 const char ftpTab[] = "<a class=\"nav-item nav-link\" id=\"nav-ftp-tab\" data-toggle=\"tab\" href=\"#nav-ftp\" role=\"tab\" aria-controls=\"nav-ftp\" aria-selected=\"false\"><i class=\"fas fa-folder\"></i><span data-i18n=\"nav.ftp\"></span></a>";
+const char bluetoothTab[] = "<a class=\"nav-item nav-link\" id=\"nav-bt-tab\" data-toggle=\"tab\" href=\"#nav-bt\" role=\"tab\" aria-controls=\"nav-bt\" aria-selected=\"false\"><i class=\"fab fa-bluetooth\"></i><span data-i18n=\"nav.bluetooth\"></span></a>";
 
 AsyncWebServer wServer(80);
 AsyncWebSocket ws("/ws");
@@ -494,6 +495,12 @@ String templateProcessor(const String &templ) {
 		#else
 			return String();
 		#endif
+	} else if (templ == "SHOW_BLUETOOTH_TAB") { // Only show Bluetooth-tab if Bluetooth-support was compiled
+		#ifdef BLUETOOTH_ENABLE
+			return bluetoothTab;
+		#else
+			return String();
+		#endif		
 	} else if (templ == "INIT_LED_BRIGHTNESS") {
 		return String(gPrefsSettings.getUChar("iLedBrightness", 0));
 	} else if (templ == "NIGHT_LED_BRIGHTNESS") {
@@ -574,10 +581,14 @@ String templateProcessor(const String &templ) {
 #ifdef MQTT_ENABLE
 		return String(gMqttPort);
 #endif
-	} else if (templ == "BT_SOURCE_NAME") {
+	} else if (templ == "BT_DEVICE_NAME") {
 		if (gPrefsSettings.isKey("btDeviceName")) {
 			return gPrefsSettings.getString("btDeviceName", "");
 		}
+	} else if (templ == "BT_PIN_CODE") {
+		if (gPrefsSettings.isKey("btPinCode")) {
+			return gPrefsSettings.getString("btPinCode", "");
+		}		
 	} else if (templ == "IPv4") {
 		return WiFi.localIP().toString();
 	} else if (templ == "RFID_TAG_ID") {
@@ -682,6 +693,12 @@ bool processJsonRequest(char *_serialJson) {
 			(!String(_mqttServer).equals(gPrefsSettings.getString("mqttServer", "-1")))) {
 			return false;
 		}
+	} else if (doc.containsKey("bluetooth")) {
+		// bluetooth settings
+		const char *_btDeviceName = doc["bluetooth"]["deviceName"];
+		gPrefsSettings.putString("btDeviceName", (String)_btDeviceName);
+		const char *btPinCode = doc["bluetooth"]["pinCode"];
+		gPrefsSettings.putString("btPinCode", (String)btPinCode);
 	} else if (doc.containsKey("rfidMod")) {
 		const char *_rfidIdModId = object["rfidMod"]["rfidIdMod"];
 		uint8_t _modId = object["rfidMod"]["modId"];
diff --git a/src/settings-override.h.sample b/src/settings-override.h.sample
index 380935ad..9a14d378 100644
--- a/src/settings-override.h.sample
+++ b/src/settings-override.h.sample
@@ -175,7 +175,6 @@
 
     // Bluetooth
     constexpr const char nameBluetoothSinkDevice[] = "ESPuino";        // Name of your ESPuino as Bluetooth-device
-    constexpr const char nameBluetoothSourceDevice[] = "My POGS Wireless Headphone"; // Name of Bluetooth-device to connect to (BT-Headset name) (https://forum.espuino.de/t/neues-feature-bluetooth-kopfhoerer/1293/)
 
     // Where to store the backup-file for NVS-records
     constexpr const char backupFile[] = "/backup.txt"; // File is written every time a (new) RFID-assignment via GUI is done
diff --git a/src/settings.h b/src/settings.h
index 0e400991..5254e695 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -195,7 +195,6 @@
 
 	// Bluetooth
 	constexpr const char nameBluetoothSinkDevice[] = "ESPuino";        // Name of your ESPuino as Bluetooth-device
-	constexpr const char nameBluetoothSourceDevice[] = "My POGS Wireless Headphone"; // Name of Bluetooth-device to connect to (BT-Headset name) (https://forum.espuino.de/t/neues-feature-bluetooth-kopfhoerer/1293/)
 
 	// Where to store the backup-file for NVS-records
 	constexpr const char backupFile[] = "/backup.txt"; // File is written every time a (new) RFID-assignment via GUI is done

From 79624de102422d316501790dd95bf7541bfe20f8 Mon Sep 17 00:00:00 2001
From: tueddy <d.carstensen@pixelplanet.de>
Date: Sun, 11 Jun 2023 23:25:49 +0200
Subject: [PATCH 2/3] spelling correction

---
 html/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/locales/de.json b/html/locales/de.json
index f8edc57f..1fa9f90f 100644
--- a/html/locales/de.json
+++ b/html/locales/de.json
@@ -215,7 +215,7 @@
             "configtitle": "Bluetooth Kopfhörer Einstellungen",
             "title": "Mit Bluetooth Kopfhörer verbinden",
             "desc": "Das Gerät verbindet sich mit dem angegebenen Bluetooth Kopfhörer. Nach dem Wechsel in diesen Modus wird die Weboberfläche nicht länger erreichbar sein.",  
-            "button": "Im Kophörer-Modus starten"
+            "button": "Im Kopfhörer-Modus starten"
         },
         "device": {
             "title": "Bluetooth-Gerät (Kopfhörer)",

From 16768e7f7d44219e978de454f911ed191b6c1c07 Mon Sep 17 00:00:00 2001
From: tueddy <d.carstensen@pixelplanet.de>
Date: Mon, 12 Jun 2023 11:49:25 +0200
Subject: [PATCH 3/3] Spelling corrections #2

---
 html/locales/de.json | 16 ++++++++--------
 html/locales/en.json | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/html/locales/de.json b/html/locales/de.json
index 1fa9f90f..c0212477 100644
--- a/html/locales/de.json
+++ b/html/locales/de.json
@@ -145,8 +145,8 @@
                     "111":"Wiederhole Titel (endlos)",
                     "120":"Dimme LEDs (Nachtmodus)",
                     "130":"Aktiviere/deaktive WLAN",
-                    "140":"Bluetooth Lautsprecher aktivieren/deaktivieren",
-                    "141":"Bluetooth Kopfhörer aktivieren/deaktivieren",
+                    "140":"Bluetooth-Lautsprecher aktivieren/deaktivieren",
+                    "141":"Bluetooth-Kopfhörer aktivieren/deaktivieren",
                     "150":"Aktiviere FTP",
                     "0":"Lösche Zuordnung",
                     "170":"Play/Pause",
@@ -207,14 +207,14 @@
     },
     "bt": {
         "sink": {
-            "title": "ESPuino als Bluetooth Lautsprecher",
-            "desc": "ESPuino wird als Bluetooth-Lautsprecher gestartet. Nach dem Wechsel in diesen Modus wird die Weboberfläche nicht länger erreichbar sein.",
-            "button": "Als Bluetooth Lautsprecher starten"
+            "title": "ESPuino als Bluetooth-Lautsprecher",
+            "desc": "ESPuino wird als Bluetooth-Lautsprecher gestartet. Nach dem Wechsel in diesen Modus wird die Web-Schnittstelle nicht mehr zur Verfügung stehen, bis das System im normalen Modus neu gestartet wird.",
+            "button": "Als Bluetooth-Lautsprecher starten"
         },
         "source": {
-            "configtitle": "Bluetooth Kopfhörer Einstellungen",
-            "title": "Mit Bluetooth Kopfhörer verbinden",
-            "desc": "Das Gerät verbindet sich mit dem angegebenen Bluetooth Kopfhörer. Nach dem Wechsel in diesen Modus wird die Weboberfläche nicht länger erreichbar sein.",  
+            "configtitle": "Bluetooth-Kopfhörer Einstellungen",
+            "title": "Mit Bluetooth-Kopfhörer verbinden",
+            "desc": "Das Gerät verbindet sich mit dem angegebenen Bluetooth-Kopfhörer. Nach dem Wechsel in diesen Modus wird die Web-Schnittstelle nicht mehr zur Verfügung stehen, bis das System im normalen Modus neu gestartet wird.",  
             "button": "Im Kopfhörer-Modus starten"
         },
         "device": {
diff --git a/html/locales/en.json b/html/locales/en.json
index 0d95e823..ef514667 100644
--- a/html/locales/en.json
+++ b/html/locales/en.json
@@ -66,7 +66,7 @@
         "voldown": "Volume Down",
         "volup": "Volume Up",
         "current": "Current track",
-        "command": "Excecute Modification"
+        "command": "Execute Modification"
     },
     "files": {
         "title": "Files",
@@ -92,7 +92,7 @@
             "desc": "Start Upload",
             "selectFolder": "Please select the upload location!",
             "selectFile": "Please select files to upload!",
-            "success": "Upload successfull ({{elapsed}}, {{speed}} KB/s)",
+            "success": "Upload successful ({{elapsed}}, {{speed}} KB/s)",
             "error": "Upload error",
             "timeCalc": "Remaining time is being calculated..",
             "minutes_one": "minute",
@@ -145,7 +145,7 @@
                     "111":"Loop track",
                     "120":"Dimm LEDs (nightmode)",
                     "130":"Toggle WiFi",
-                    "140":"Toggle Bluetooth Speeker",
+                    "140":"Toggle Bluetooth Speaker",
                     "141":"Toggle Bluetooth Headphones",
                     "150":"Enable FTP",
                     "0":"Remove assignment",
@@ -208,13 +208,13 @@
     "bt": {
         "sink": {
             "title": "ESPuino as Bluetooth speaker",
-            "desc": "ESPuino is started as a Bluetooth speaker. After switching to this mode, the web interface will no longer be accessible.",
+            "desc": "ESPuino is started as a Bluetooth speaker. After switching to this mode, the web interface will no longer be available until the system is restarted in normal mode.",
             "button": "Start as Bluetooth speaker"
         },
         "source": {
             "configtitle": "Bluetooth headphone settings",
             "title": "Connect with Bluetooth headphone",
-            "desc": "The device connects to the specified Bluetooth headset. After switching to this mode, the web interface will no longer be accessible.",  
+            "desc": "The device connects to the specified Bluetooth headset. After switching to this mode, the web interface will no longer be available until the system is restarted in normal mode.",  
             "button": "Start in headphone mode"
         },
         "device": {