Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed: BluFi module link error(C++ hybrid compilation) (IDFGH-8087) #9588

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions components/bt/common/btc/profile/esp/blufi/include/blufi_int.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@

#include "btc/btc_task.h"
#include "esp_blufi_api.h"

#ifdef __cplusplus
extern "C" {
#endif

#if (BLUFI_INCLUDED == TRUE)

#define BTC_BLUFI_GREAT_VER 0x01 //Version + Subversion
Expand Down Expand Up @@ -190,5 +195,10 @@ void btc_blufi_cb_deep_copy(btc_msg_t *msg, void *p_dest, void *p_src);

void btc_blufi_cb_deep_free(btc_msg_t *msg);

#endif /* __BLUFI_INT_H__ */
#endif ///BLUFI_INCLUDED == TRUE
#endif ///BLUFI_INCLUDED == TRUE

#ifdef __cplusplus
}
#endif

#endif /* __BLUFI_INT_H__ */
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
#include "esp_gap_ble_api.h"
#endif


#ifdef __cplusplus
extern "C" {
#endif

#define BLUFI_APP_UUID 0xFFFF
#define BLUFI_DEVICE_NAME "BLUFI_DEVICE"

Expand Down Expand Up @@ -80,4 +85,7 @@ void esp_blufi_adv_start(void);

void esp_blufi_send_encap(void *arg);

#ifdef __cplusplus
}
#endif
#endif/* _ESP_BLUFI_ */
8 changes: 8 additions & 0 deletions components/bt/common/btc/profile/esp/include/btc_blufi_prf.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@
#define ESP_BLUFI_SUCCESS 0x00
#endif


#ifdef __cplusplus
extern "C" {
#endif

#define BT_BD_ADDR_STR "%02x:%02x:%02x:%02x:%02x:%02x"
#define BT_BD_ADDR_HEX(addr) addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]

Expand Down Expand Up @@ -100,4 +105,7 @@ void btc_blufi_call_deep_free(btc_msg_t *msg);

uint16_t btc_blufi_get_version(void);

#ifdef __cplusplus
}
#endif
#endif /* __BTC_BLUFI_PRF_H__ */