From f714f825209be82c6f12c227f449931f8da481fa Mon Sep 17 00:00:00 2001 From: gornekich Date: Wed, 30 Mar 2022 14:31:06 +0300 Subject: [PATCH 1/2] Bump RPC version with fixed BLE (#1071) * furi_hal_bt: change furi_assert -> furi_check * battery_service: change log level * protobuf: update submodule, bump RPC version --- assets/compiled/protobuf_version.h | 2 +- assets/protobuf | 2 +- firmware/targets/f7/ble_glue/battery_service.c | 2 +- firmware/targets/f7/furi_hal/furi_hal_bt.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/compiled/protobuf_version.h b/assets/compiled/protobuf_version.h index 1e438d714..19d3f1eac 100644 --- a/assets/compiled/protobuf_version.h +++ b/assets/compiled/protobuf_version.h @@ -1,3 +1,3 @@ #pragma once #define PROTOBUF_MAJOR_VERSION 0 -#define PROTOBUF_MINOR_VERSION 2 +#define PROTOBUF_MINOR_VERSION 3 diff --git a/assets/protobuf b/assets/protobuf index 232e7e9a5..cd11b029a 160000 --- a/assets/protobuf +++ b/assets/protobuf @@ -1 +1 @@ -Subproject commit 232e7e9a50b12a95f950fabb515204775e51b04a +Subproject commit cd11b029ac21462ea8a7615126d0a29e087c2908 diff --git a/firmware/targets/f7/ble_glue/battery_service.c b/firmware/targets/f7/ble_glue/battery_service.c index 1ee155bb6..85f1eeea0 100644 --- a/firmware/targets/f7/ble_glue/battery_service.c +++ b/firmware/targets/f7/ble_glue/battery_service.c @@ -71,7 +71,7 @@ bool battery_svc_update_level(uint8_t battery_charge) { return false; } // 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( battery_svc->svc_handle, battery_svc->char_level_handle, 0, 1, &battery_charge); if(result) { diff --git a/firmware/targets/f7/furi_hal/furi_hal_bt.c b/firmware/targets/f7/furi_hal/furi_hal_bt.c index f379692ef..d9a62b87c 100755 --- a/firmware/targets/f7/furi_hal/furi_hal_bt.c +++ b/firmware/targets/f7/furi_hal/furi_hal_bt.c @@ -83,7 +83,7 @@ void furi_hal_bt_init() { // Explicitly tell that we are in charge of CLK48 domain 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 @@ -125,7 +125,7 @@ bool furi_hal_bt_start_radio_stack() { // Explicitly tell that we are in charge of CLK48 domain 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 { From 648d8aaa54183224c8cf1560947875f0f6da76d3 Mon Sep 17 00:00:00 2001 From: SG Date: Wed, 30 Mar 2022 21:54:29 +1000 Subject: [PATCH 2/2] [FL-2381] iButton CLI: update Metakom description, add forgotten read message #1072 --- applications/ibutton/ibutton_cli.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/applications/ibutton/ibutton_cli.c b/applications/ibutton/ibutton_cli.c index 1c281dc2c..99fc260e8 100644 --- a/applications/ibutton/ibutton_cli.c +++ b/applications/ibutton/ibutton_cli.c @@ -27,7 +27,7 @@ void ibutton_cli_print_usage() { printf("\t choose from:\r\n"); printf("\tDallas (8 bytes key_data)\r\n"); printf("\tCyfral (2 bytes key_data)\r\n"); - printf("\tMetakom (4 bytes key_data)\r\n"); + printf("\tMetakom (4 bytes key_data), must contain correct parity\r\n"); printf("\t are hex-formatted\r\n"); }; @@ -75,6 +75,7 @@ void ibutton_cli_read(Cli* cli) { ibutton_worker_start_thread(worker); ibutton_worker_read_set_callback(worker, ibutton_cli_worker_read_cb, event); + printf("Reading iButton...\r\nPress Ctrl+C to abort\r\n"); ibutton_worker_read_start(worker, key); while(true) { uint32_t flags = osEventFlagsWait(event, EVENT_FLAG_IBUTTON_COMPLETE, osFlagsWaitAny, 100);