Merge branch 'ofw_dev' into blerefactr

targets/furi_hal_include/furi_hal_bt.h

@@ -8,15 +8,15 @@
 #include <furi.h>
 #include <stdbool.h>
 #include <gap.h>
-#include <services/serial_service.h>
+#include <extra_beacon.h>
+#include <furi_ble/profile_interface.h>
 #include <ble_glue.h>
 #include <ble_app.h>
-
-#include <furi_hal_bt_serial.h>
+#include <stdint.h>
 
 #define FURI_HAL_BT_STACK_VERSION_MAJOR (1)
 #define FURI_HAL_BT_STACK_VERSION_MINOR (12)
-#define FURI_HAL_BT_C2_START_TIMEOUT 1000
+#define FURI_HAL_BT_C2_START_TIMEOUT (1000)
 
 #define FURI_HAL_BT_EMPTY_MAC_ADDR \
     { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
@@ -34,14 +34,6 @@ typedef enum {
     FuriHalBtStackFull,
 } FuriHalBtStack;
 
-typedef enum {
-    FuriHalBtProfileSerial,
-    FuriHalBtProfileHidKeyboard,
-
-    // Keep last for Profiles number calculation
-    FuriHalBtProfileNumber,
-} FuriHalBtProfile;
-
 /** Initialize
  */
 void furi_hal_bt_init();
@@ -68,7 +60,7 @@ FuriHalBtStack furi_hal_bt_get_radio_stack();
  *
  * @return  true if supported
  */
-bool furi_hal_bt_is_ble_gatt_gap_supported();
+bool furi_hal_bt_is_gatt_gap_supported();
 
 /** Check if radio stack supports testing
  *
@@ -76,15 +68,31 @@ bool furi_hal_bt_is_ble_gatt_gap_supported();
  */
 bool furi_hal_bt_is_testing_supported();
 
-/** Start BLE app
+/** Check if particular instance of profile belongs to given type
  *
- * @param profile   FuriHalBtProfile instance
- * @param event_cb  GapEventCallback instance
- * @param context   pointer to context
+ * @param profile           FuriHalBtProfile instance. If NULL, uses current profile
+ * @param profile_template  basic profile template to check against
  *
  * @return          true on success
 */
-bool furi_hal_bt_start_app(FuriHalBtProfile profile, GapEventCallback event_cb, void* context);
+bool furi_hal_bt_check_profile_type(
+    FuriHalBleProfileBase* profile,
+    const FuriHalBleProfileTemplate* profile_template);
+
+/** Start BLE app
+ *
+ * @param profile_template  FuriHalBleProfileTemplate instance
+ * @param params            Parameters to pass to the profile. Can be NULL
+ * @param event_cb          GapEventCallback instance
+ * @param context           pointer to context
+ *
+ * @return                  instance of profile, NULL on failure
+*/
+FURI_WARN_UNUSED FuriHalBleProfileBase* furi_hal_bt_start_app(
+    const FuriHalBleProfileTemplate* profile_template,
+    FuriHalBleProfileParams params,
+    GapEventCallback event_cb,
+    void* context);
 
 /** Reinitialize core2
  * 
@@ -95,13 +103,17 @@ void furi_hal_bt_reinit();
 /** Change BLE app
  * Restarts 2nd core
  *
- * @param profile   FuriHalBtProfile instance
+ * @param profile   FuriHalBleProfileTemplate instance
  * @param event_cb  GapEventCallback instance
  * @param context   pointer to context
  *
- * @return          true on success
+ * @return          instance of profile, NULL on failure
 */
-bool furi_hal_bt_change_app(FuriHalBtProfile profile, GapEventCallback event_cb, void* context);
+FURI_WARN_UNUSED FuriHalBleProfileBase* furi_hal_bt_change_app(
+    const FuriHalBleProfileTemplate* profile_template,
+    FuriHalBleProfileParams profile_params,
+    GapEventCallback event_cb,
+    void* context);
 
 /** Update battery level
  *
@@ -110,7 +122,7 @@ bool furi_hal_bt_change_app(FuriHalBtProfile profile, GapEventCallback event_cb,
 void furi_hal_bt_update_battery_level(uint8_t battery_level);
 
 /** Update battery power state */
-void furi_hal_bt_update_power_state();
+void furi_hal_bt_update_power_state(bool charging);
 
 /** Checks if BLE state is active
  *
@@ -295,18 +307,60 @@ bool furi_hal_bt_is_connected(void);
  */
 bool furi_hal_bt_ensure_c2_mode(BleGlueC2Mode mode);
 
-typedef struct {
-    uint32_t magic;
-    uint32_t source_pc;
-    uint32_t source_lr;
-    uint32_t source_sp;
-} FuriHalBtHardfaultInfo;
-
-/** Get hardfault info
- *
- * @return     hardfault info. NULL if no hardfault
+/**
+ * Extra BLE beacon API 
  */
-const FuriHalBtHardfaultInfo* furi_hal_bt_get_hardfault_info();
+
+/** Set extra beacon data. Can be called in any state
+ *
+ * @param[in]  data  data to set
+ * @param[in]  len   data length. Must be <= EXTRA_BEACON_MAX_DATA_SIZE
+ *
+ * @return     true on success
+ */
+bool furi_hal_bt_extra_beacon_set_data(const uint8_t* data, uint8_t len);
+
+/** Get last configured extra beacon data
+ *
+ * @param      data  data buffer to write to. Must be at least EXTRA_BEACON_MAX_DATA_SIZE bytes long
+ *
+ * @return     valid data length
+ */
+uint8_t furi_hal_bt_extra_beacon_get_data(uint8_t* data);
+
+/** Configure extra beacon.
+ *
+ * @param[in]  config  extra beacon config: interval, power, address, etc.
+ *
+ * @return     true on success
+ */
+bool furi_hal_bt_extra_beacon_set_config(const GapExtraBeaconConfig* config);
+
+/** Start extra beacon. 
+ * Beacon must configured with furi_hal_bt_extra_beacon_set_config()
+ * and in stopped state before calling this function.
+ *
+ * @return     true on success
+ */
+bool furi_hal_bt_extra_beacon_start();
+
+/** Stop extra beacon
+ *
+ * @return     true on success
+ */
+bool furi_hal_bt_extra_beacon_stop();
+
+/** Check if extra beacon is active.
+ *
+ * @return     extra beacon state
+ */
+bool furi_hal_bt_extra_beacon_is_active();
+
+/** Get last configured extra beacon config
+ *
+ * @return     extra beacon config. NULL if beacon had never been configured.
+ */
+const GapExtraBeaconConfig* furi_hal_bt_extra_beacon_get_config();
 
 #ifdef __cplusplus
 }