Skip to content

Commit 4ae9a02

Browse files
authored
FuriHal ble: length fix for fw version prop (#3136)
* hal ble: length fix for fw version prop * hal ble: dev_info char: setting data after setup is done * api: storage: enabled storage_file_sync
1 parent 62a4c0d commit 4ae9a02

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

firmware/targets/f18/api_symbols.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
entry,status,name,type,params
2-
Version,+,39.1,,
2+
Version,+,39.2,,
33
Header,+,applications/services/bt/bt_service/bt.h,,
44
Header,+,applications/services/cli/cli.h,,
55
Header,+,applications/services/cli/cli_vcp.h,,
@@ -2007,7 +2007,7 @@ Function,+,storage_file_open,_Bool,"File*, const char*, FS_AccessMode, FS_OpenMo
20072007
Function,+,storage_file_read,uint16_t,"File*, void*, uint16_t"
20082008
Function,+,storage_file_seek,_Bool,"File*, uint32_t, _Bool"
20092009
Function,+,storage_file_size,uint64_t,File*
2010-
Function,-,storage_file_sync,_Bool,File*
2010+
Function,+,storage_file_sync,_Bool,File*
20112011
Function,+,storage_file_tell,uint64_t,File*
20122012
Function,+,storage_file_truncate,_Bool,File*
20132013
Function,+,storage_file_write,uint16_t,"File*, const void*, uint16_t"

firmware/targets/f7/api_symbols.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
entry,status,name,type,params
2-
Version,+,39.1,,
2+
Version,+,39.2,,
33
Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,,
44
Header,+,applications/services/bt/bt_service/bt.h,,
55
Header,+,applications/services/cli/cli.h,,
@@ -2617,7 +2617,7 @@ Function,+,storage_file_open,_Bool,"File*, const char*, FS_AccessMode, FS_OpenMo
26172617
Function,+,storage_file_read,uint16_t,"File*, void*, uint16_t"
26182618
Function,+,storage_file_seek,_Bool,"File*, uint32_t, _Bool"
26192619
Function,+,storage_file_size,uint64_t,File*
2620-
Function,-,storage_file_sync,_Bool,File*
2620+
Function,+,storage_file_sync,_Bool,File*
26212621
Function,+,storage_file_tell,uint64_t,File*
26222622
Function,+,storage_file_truncate,_Bool,File*
26232623
Function,+,storage_file_write,uint16_t,"File*, const void*, uint16_t"

firmware/targets/f7/ble_glue/services/dev_info_service.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ static bool dev_info_char_firmware_rev_callback(
3939
const uint8_t** data,
4040
uint16_t* data_len) {
4141
const DevInfoSvc* dev_info_svc = *(DevInfoSvc**)context;
42-
*data_len = sizeof(dev_info_svc->hardware_revision);
42+
*data_len = strlen(dev_info_svc->hardware_revision);
4343
if(data) {
4444
*data = (const uint8_t*)&dev_info_svc->hardware_revision;
4545
}
@@ -155,17 +155,19 @@ void dev_info_svc_start() {
155155
void dev_info_svc_stop() {
156156
tBleStatus status;
157157
if(dev_info_svc) {
158-
furi_string_free(dev_info_svc->version_string);
159158
// Delete service characteristics
160159
for(size_t i = 0; i < DevInfoSvcGattCharacteristicCount; i++) {
161160
flipper_gatt_characteristic_delete(
162161
dev_info_svc->service_handle, &dev_info_svc->characteristics[i]);
163162
}
163+
164164
// Delete service
165165
status = aci_gatt_del_service(dev_info_svc->service_handle);
166166
if(status) {
167167
FURI_LOG_E(TAG, "Failed to delete device info service: %d", status);
168168
}
169+
170+
furi_string_free(dev_info_svc->version_string);
169171
free(dev_info_svc);
170172
dev_info_svc = NULL;
171173
}

0 commit comments

Comments
 (0)