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

Bump RPC version with fixed BLE (#1071)

Browse Source 
* furi_hal_bt: change furi_assert -> furi_check
* battery_service: change log level
* protobuf: update submodule, bump RPC version
This commit is contained in:
gornekich 2022-03-30 14:31:06 +03:00 committed by GitHub
parent 489caa8e77
commit f714f82520
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/compiled/protobuf_version.h
View File

@ -1,3 +1,3 @@
#pragma once #pragma once
#define PROTOBUF_MAJOR_VERSION 0 #define PROTOBUF_MAJOR_VERSION 0
#define PROTOBUF_MINOR_VERSION 2 #define PROTOBUF_MINOR_VERSION 3

2
assets/protobuf

@ -1 +1 @@
Subproject commit 232e7e9a50b12a95f950fabb515204775e51b04a Subproject commit cd11b029ac21462ea8a7615126d0a29e087c2908

2
firmware/targets/f7/ble_glue/battery_service.c
View File

@ -71,7 +71,7 @@ bool battery_svc_update_level(uint8_t battery_charge) {
return false; return false;
} }
// Update battery level characteristic // Update battery level characteristic
FURI_LOG_I(TAG, "Updating battery level characteristic"); FURI_LOG_D(TAG, "Updating battery level characteristic");
tBleStatus result = aci_gatt_update_char_value( tBleStatus result = aci_gatt_update_char_value(
battery_svc->svc_handle, battery_svc->char_level_handle, 0, 1, &battery_charge); battery_svc->svc_handle, battery_svc->char_level_handle, 0, 1, &battery_charge);
if(result) { if(result) {

4
firmware/targets/f7/furi_hal/furi_hal_bt.c
View File

@ -83,7 +83,7 @@ void furi_hal_bt_init() {
// Explicitly tell that we are in charge of CLK48 domain // Explicitly tell that we are in charge of CLK48 domain
if(!LL_HSEM_IsSemaphoreLocked(HSEM, CFG_HW_CLK48_CONFIG_SEMID)) { if(!LL_HSEM_IsSemaphoreLocked(HSEM, CFG_HW_CLK48_CONFIG_SEMID)) {
furi_assert(LL_HSEM_1StepLock(HSEM, CFG_HW_CLK48_CONFIG_SEMID) == 0); furi_check(LL_HSEM_1StepLock(HSEM, CFG_HW_CLK48_CONFIG_SEMID) == 0);
} }
// Start Core2 // Start Core2
@ -125,7 +125,7 @@ bool furi_hal_bt_start_radio_stack() {
// Explicitly tell that we are in charge of CLK48 domain // Explicitly tell that we are in charge of CLK48 domain
if(!LL_HSEM_IsSemaphoreLocked(HSEM, CFG_HW_CLK48_CONFIG_SEMID)) { if(!LL_HSEM_IsSemaphoreLocked(HSEM, CFG_HW_CLK48_CONFIG_SEMID)) {
furi_assert(LL_HSEM_1StepLock(HSEM, CFG_HW_CLK48_CONFIG_SEMID) == 0); furi_check(LL_HSEM_1StepLock(HSEM, CFG_HW_CLK48_CONFIG_SEMID) == 0);
} }
do { do {