@@ -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[] = "
";
const char ftpTab[] = "
";
+const char bluetoothTab[] = "
";
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