1
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-12 04:34:43 +04:00

Merge remote-tracking branch 'OFW/dev' into dev [ci skip]

This commit is contained in:
MX
2025-04-07 18:24:36 +03:00
2 changed files with 3 additions and 3 deletions

View File

@@ -24,7 +24,7 @@ typedef struct {
uint8_t adv_svc_uuid_len; uint8_t adv_svc_uuid_len;
uint8_t adv_svc_uuid[20]; uint8_t adv_svc_uuid[20];
uint8_t mfg_data_len; uint8_t mfg_data_len;
uint8_t mfg_data[20]; uint8_t mfg_data[23];
char* adv_name; char* adv_name;
} GapSvc; } GapSvc;
@@ -328,7 +328,7 @@ static void set_advertisment_service_uid(uint8_t* uid, uint8_t uid_len) {
} }
static void set_manufacturer_data(uint8_t* mfg_data, uint8_t mfg_data_len) { static void set_manufacturer_data(uint8_t* mfg_data, uint8_t mfg_data_len) {
furi_check(mfg_data_len < sizeof(gap->service.mfg_data) - 2); furi_check(mfg_data_len <= sizeof(gap->service.mfg_data) - 2);
gap->service.mfg_data[0] = mfg_data_len + 1; gap->service.mfg_data[0] = mfg_data_len + 1;
gap->service.mfg_data[1] = AD_TYPE_MANUFACTURER_SPECIFIC_DATA; gap->service.mfg_data[1] = AD_TYPE_MANUFACTURER_SPECIFIC_DATA;
memcpy(&gap->service.mfg_data[gap->service.mfg_data_len], mfg_data, mfg_data_len); memcpy(&gap->service.mfg_data[gap->service.mfg_data_len], mfg_data, mfg_data_len);

View File

@@ -74,7 +74,7 @@ typedef struct {
uint16_t Service_UUID_16; uint16_t Service_UUID_16;
uint8_t Service_UUID_128[16]; uint8_t Service_UUID_128[16];
} adv_service; } adv_service;
uint8_t mfg_data[20]; uint8_t mfg_data[23];
uint8_t mfg_data_len; uint8_t mfg_data_len;
uint16_t appearance_char; uint16_t appearance_char;
bool bonding_mode; bool bonding_mode;