mount/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FuriHal ble: length fix for fw version prop (#3136)

Browse Source 
* 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
This commit is contained in:
hedger 2023-10-09 15:53:20 +03:00 committed by GitHub
parent 62a4c0dd03
commit 4ae9a02efa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/targets/f18/api_symbols.csv
View File

@ -1,5 +1,5 @@
entry,status,name,type,params entry,status,name,type,params
Version,+,39.1,, Version,+,39.2,,
Header,+,applications/services/bt/bt_service/bt.h,, Header,+,applications/services/bt/bt_service/bt.h,,
Header,+,applications/services/cli/cli.h,, Header,+,applications/services/cli/cli.h,,
Header,+,applications/services/cli/cli_vcp.h,, Header,+,applications/services/cli/cli_vcp.h,,
@ -2007,7 +2007,7 @@ Function,+,storage_file_open,_Bool,"File*, const char*, FS_AccessMode, FS_OpenMo
Function,+,storage_file_read,uint16_t,"File*, void*, uint16_t" Function,+,storage_file_read,uint16_t,"File*, void*, uint16_t"
Function,+,storage_file_seek,_Bool,"File*, uint32_t, _Bool" Function,+,storage_file_seek,_Bool,"File*, uint32_t, _Bool"
Function,+,storage_file_size,uint64_t,File* Function,+,storage_file_size,uint64_t,File*
Function,-,storage_file_sync,_Bool,File* Function,+,storage_file_sync,_Bool,File*
Function,+,storage_file_tell,uint64_t,File* Function,+,storage_file_tell,uint64_t,File*
Function,+,storage_file_truncate,_Bool,File* Function,+,storage_file_truncate,_Bool,File*
Function,+,storage_file_write,uint16_t,"File*, const void*, uint16_t" Function,+,storage_file_write,uint16_t,"File*, const void*, uint16_t"

1 entry status name type params
2 Version + 39.1 39.2
3 Header + applications/services/bt/bt_service/bt.h
4 Header + applications/services/cli/cli.h
5 Header + applications/services/cli/cli_vcp.h
2007 Function + storage_file_read uint16_t File*, void*, uint16_t
2008 Function + storage_file_seek _Bool File*, uint32_t, _Bool
2009 Function + storage_file_size uint64_t File*
2010 Function - + storage_file_sync _Bool File*
2011 Function + storage_file_tell uint64_t File*
2012 Function + storage_file_truncate _Bool File*
2013 Function + storage_file_write uint16_t File*, const void*, uint16_t

4
firmware/targets/f7/api_symbols.csv
View File

@ -1,5 +1,5 @@
entry,status,name,type,params entry,status,name,type,params
Version,+,39.1,, Version,+,39.2,,
Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,, Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,,
Header,+,applications/services/bt/bt_service/bt.h,, Header,+,applications/services/bt/bt_service/bt.h,,
Header,+,applications/services/cli/cli.h,, Header,+,applications/services/cli/cli.h,,
@ -2617,7 +2617,7 @@ Function,+,storage_file_open,_Bool,"File*, const char*, FS_AccessMode, FS_OpenMo
Function,+,storage_file_read,uint16_t,"File*, void*, uint16_t" Function,+,storage_file_read,uint16_t,"File*, void*, uint16_t"
Function,+,storage_file_seek,_Bool,"File*, uint32_t, _Bool" Function,+,storage_file_seek,_Bool,"File*, uint32_t, _Bool"
Function,+,storage_file_size,uint64_t,File* Function,+,storage_file_size,uint64_t,File*
Function,-,storage_file_sync,_Bool,File* Function,+,storage_file_sync,_Bool,File*
Function,+,storage_file_tell,uint64_t,File* Function,+,storage_file_tell,uint64_t,File*
Function,+,storage_file_truncate,_Bool,File* Function,+,storage_file_truncate,_Bool,File*
Function,+,storage_file_write,uint16_t,"File*, const void*, uint16_t" Function,+,storage_file_write,uint16_t,"File*, const void*, uint16_t"

1 entry status name type params
2 Version + 39.1 39.2
3 Header + applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h
4 Header + applications/services/bt/bt_service/bt.h
5 Header + applications/services/cli/cli.h
2617 Function + storage_file_read uint16_t File*, void*, uint16_t
2618 Function + storage_file_seek _Bool File*, uint32_t, _Bool
2619 Function + storage_file_size uint64_t File*
2620 Function - + storage_file_sync _Bool File*
2621 Function + storage_file_tell uint64_t File*
2622 Function + storage_file_truncate _Bool File*
2623 Function + storage_file_write uint16_t File*, const void*, uint16_t

6
firmware/targets/f7/ble_glue/services/dev_info_service.c
View File

@ -39,7 +39,7 @@ static bool dev_info_char_firmware_rev_callback(
const uint8_t** data, const uint8_t** data,
uint16_t* data_len) { uint16_t* data_len) {
const DevInfoSvc* dev_info_svc = *(DevInfoSvc**)context; const DevInfoSvc* dev_info_svc = *(DevInfoSvc**)context;
*data_len = sizeof(dev_info_svc->hardware_revision); *data_len = strlen(dev_info_svc->hardware_revision);
if(data) { if(data) {
*data = (const uint8_t*)&dev_info_svc->hardware_revision; *data = (const uint8_t*)&dev_info_svc->hardware_revision;
} }
@ -155,17 +155,19 @@ void dev_info_svc_start() {
void dev_info_svc_stop() { void dev_info_svc_stop() {
tBleStatus status; tBleStatus status;
if(dev_info_svc) { if(dev_info_svc) {
furi_string_free(dev_info_svc->version_string);
// Delete service characteristics // Delete service characteristics
for(size_t i = 0; i < DevInfoSvcGattCharacteristicCount; i++) { for(size_t i = 0; i < DevInfoSvcGattCharacteristicCount; i++) {
flipper_gatt_characteristic_delete( flipper_gatt_characteristic_delete(
dev_info_svc->service_handle, &dev_info_svc->characteristics[i]); dev_info_svc->service_handle, &dev_info_svc->characteristics[i]);
} }
// Delete service // Delete service
status = aci_gatt_del_service(dev_info_svc->service_handle); status = aci_gatt_del_service(dev_info_svc->service_handle);
if(status) { if(status) {
FURI_LOG_E(TAG, "Failed to delete device info service: %d", status); FURI_LOG_E(TAG, "Failed to delete device info service: %d", status);
} }
furi_string_free(dev_info_svc->version_string);
free(dev_info_svc); free(dev_info_svc);
dev_info_svc = NULL; dev_info_svc = NULL;
} }