Merge fixes

+ thanks @Willy-JL !

applications/services/bt/bt_service/bt.h

@@ -5,8 +5,6 @@
 #include <furi_ble/profile_interface.h>
 #include <core/common_defines.h>
 
-#include <furi_hal_bt.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -22,6 +20,11 @@ typedef enum {
     BtStatusConnected,
 } BtStatus;
 
+typedef struct {
+    uint8_t rssi;
+    uint32_t since;
+} BtRssi;
+
 typedef void (*BtStatusChangedCallback)(BtStatus status, void* context);
 
 /** Change BLE Profile
@@ -81,31 +84,20 @@ void bt_keys_storage_set_storage_path(Bt* bt, const char* keys_storage_path);
  */
 void bt_keys_storage_set_default_path(Bt* bt);
 
-// New methods
-
-void bt_set_profile_adv_name(Bt* bt, const char* fmt, ...);
-
-const char* bt_get_profile_adv_name(Bt* bt);
-
-void bt_set_profile_mac_address(Bt* bt, const uint8_t mac[6]);
-
-const uint8_t* bt_get_profile_mac_address(Bt* bt);
-
 bool bt_remote_rssi(Bt* bt, uint8_t* rssi);
 
-void bt_set_profile_pairing_method(Bt* bt, GapPairing pairing_method);
-GapPairing bt_get_profile_pairing_method(Bt* bt);
-
-/** Stop saving new peer key to flash (in .bt.keys file)
+/**
  * 
+ * (Probably bad) way of opening the RPC connection, everywhereTM
 */
-void bt_disable_peer_key_update(Bt* bt);
 
-/** Enable saving peer key to internal flash (enable by default)
+void bt_open_rpc_connection(Bt* bt);
+
+/**
  * 
- * @note This function should be called if bt_disable_peer_key_update was called before
+ * Closing the RPC connection, everywhereTM
 */
-void bt_enable_peer_key_update(Bt* bt);
+void bt_close_rpc_connection(Bt* bt);
 
 #ifdef __cplusplus
 }