[FL-1220] BLE scan MAC addresses test (#939)
* bt: refactore cli commands * bt: add radio stack control, add scan mac addresses * bt: refactore with new furi-hal-bt API * bt: f6 targer sync * bt: code cleanup, update documentation * Bt: new command names, proper radio stack handling Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
@@ -1,23 +1,18 @@
|
||||
#include "bt_cli.h"
|
||||
#include <furi.h>
|
||||
#include <furi-hal.h>
|
||||
#include <applications/cli/cli.h>
|
||||
#include <lib/toolbox/args.h>
|
||||
|
||||
#include "bt_settings.h"
|
||||
|
||||
void bt_on_system_start() {
|
||||
#ifdef SRV_CLI
|
||||
Cli* cli = furi_record_open("cli");
|
||||
static const char* bt_cli_address_types[] = {
|
||||
"Public Device Address",
|
||||
"Random Device Address",
|
||||
"Public Identity Address",
|
||||
"Random (Static) Identity Address",
|
||||
};
|
||||
|
||||
cli_add_command(cli, "bt_info", CliCommandFlagDefault, bt_cli_command_info, NULL);
|
||||
cli_add_command(cli, "bt_tx_carrier", CliCommandFlagDefault, bt_cli_command_carrier_tx, NULL);
|
||||
cli_add_command(cli, "bt_rx_carrier", CliCommandFlagDefault, bt_cli_command_carrier_rx, NULL);
|
||||
cli_add_command(cli, "bt_tx_pt", CliCommandFlagDefault, bt_cli_command_packet_tx, NULL);
|
||||
cli_add_command(cli, "bt_rx_pt", CliCommandFlagDefault, bt_cli_command_packet_rx, NULL);
|
||||
|
||||
furi_record_close("cli");
|
||||
#endif
|
||||
}
|
||||
|
||||
void bt_cli_command_info(Cli* cli, string_t args, void* context) {
|
||||
static void bt_cli_command_hci_info(Cli* cli, string_t args, void* context) {
|
||||
string_t buffer;
|
||||
string_init(buffer);
|
||||
furi_hal_bt_dump_state(buffer);
|
||||
@@ -25,160 +20,229 @@ void bt_cli_command_info(Cli* cli, string_t args, void* context) {
|
||||
string_clear(buffer);
|
||||
}
|
||||
|
||||
void bt_cli_command_carrier_tx(Cli* cli, string_t args, void* context) {
|
||||
uint16_t channel;
|
||||
uint16_t power;
|
||||
BtSettings bt_settings;
|
||||
bt_settings_load(&bt_settings);
|
||||
static void bt_cli_command_carrier_tx(Cli* cli, string_t args, void* context) {
|
||||
int channel = 0;
|
||||
int power = 0;
|
||||
|
||||
int ret = sscanf(string_get_cstr(args), "%hu %hu", &channel, &power);
|
||||
if(ret != 2) {
|
||||
printf("sscanf returned %d, channel: %hu, power: %hu\r\n", ret, channel, power);
|
||||
cli_print_usage("bt_tx_carrier", "<Channel number> <Power>", string_get_cstr(args));
|
||||
return;
|
||||
}
|
||||
if(channel > 39) {
|
||||
printf("Channel number must be in 0...39 range, not %hu\r\n", channel);
|
||||
return;
|
||||
}
|
||||
if(power > 6) {
|
||||
printf("Power must be in 0...6 dB range, not %hu\r\n", power);
|
||||
return;
|
||||
}
|
||||
do {
|
||||
if(!args_read_int_and_trim(args, &channel) && (channel < 0 || channel > 39)) {
|
||||
printf("Incorrect or missing channel, expected int 0-39");
|
||||
break;
|
||||
}
|
||||
if(!args_read_int_and_trim(args, &power) && (power < 0 || power > 6)) {
|
||||
printf("Incorrect or missing power, expected int 0-6");
|
||||
break;
|
||||
}
|
||||
|
||||
furi_hal_bt_stop_advertising();
|
||||
printf("Transmitting carrier at %hu channel at %hu dB power\r\n", channel, power);
|
||||
printf("Press CTRL+C to stop\r\n");
|
||||
furi_hal_bt_start_tone_tx(channel, 0x19 + power);
|
||||
furi_hal_bt_stop_advertising();
|
||||
printf("Transmitting carrier at %d channel at %d dB power\r\n", channel, power);
|
||||
printf("Press CTRL+C to stop\r\n");
|
||||
furi_hal_bt_start_tone_tx(channel, 0x19 + power);
|
||||
|
||||
while(!cli_cmd_interrupt_received(cli)) {
|
||||
osDelay(250);
|
||||
while(!cli_cmd_interrupt_received(cli)) {
|
||||
osDelay(250);
|
||||
}
|
||||
furi_hal_bt_stop_tone_tx();
|
||||
} while(false);
|
||||
}
|
||||
|
||||
static void bt_cli_command_carrier_rx(Cli* cli, string_t args, void* context) {
|
||||
int channel = 0;
|
||||
|
||||
do {
|
||||
if(!args_read_int_and_trim(args, &channel) && (channel < 0 || channel > 39)) {
|
||||
printf("Incorrect or missing channel, expected int 0-39");
|
||||
break;
|
||||
}
|
||||
|
||||
furi_hal_bt_stop_advertising();
|
||||
printf("Receiving carrier at %d channel\r\n", channel);
|
||||
printf("Press CTRL+C to stop\r\n");
|
||||
|
||||
furi_hal_bt_start_packet_rx(channel, 1);
|
||||
|
||||
while(!cli_cmd_interrupt_received(cli)) {
|
||||
osDelay(250);
|
||||
printf("RSSI: %6.1f dB\r", furi_hal_bt_get_rssi());
|
||||
fflush(stdout);
|
||||
}
|
||||
|
||||
furi_hal_bt_stop_packet_test();
|
||||
} while(false);
|
||||
}
|
||||
|
||||
static void bt_cli_command_packet_tx(Cli* cli, string_t args, void* context) {
|
||||
int channel = 0;
|
||||
int pattern = 0;
|
||||
int datarate = 1;
|
||||
|
||||
do {
|
||||
if(!args_read_int_and_trim(args, &channel) && (channel < 0 || channel > 39)) {
|
||||
printf("Incorrect or missing channel, expected int 0-39");
|
||||
break;
|
||||
}
|
||||
if(!args_read_int_and_trim(args, &pattern) && (pattern < 0 || pattern > 5)) {
|
||||
printf("Incorrect or missing pattern, expected int 0-5 \r\n");
|
||||
printf("0 - Pseudo-Random bit sequence 9\r\n");
|
||||
printf("1 - Pattern of alternating bits '11110000'\r\n");
|
||||
printf("2 - Pattern of alternating bits '10101010'\r\n");
|
||||
printf("3 - Pseudo-Random bit sequence 15\r\n");
|
||||
printf("4 - Pattern of All '1' bits\r\n");
|
||||
printf("5 - Pattern of All '0' bits\r\n");
|
||||
break;
|
||||
}
|
||||
if(!args_read_int_and_trim(args, &datarate) && (datarate < 1 || datarate > 2)) {
|
||||
printf("Incorrect or missing datarate, expected int 1-2");
|
||||
break;
|
||||
}
|
||||
|
||||
furi_hal_bt_stop_advertising();
|
||||
printf(
|
||||
"Transmitting %d pattern packet at %d channel at %d M datarate\r\n",
|
||||
pattern,
|
||||
channel,
|
||||
datarate);
|
||||
printf("Press CTRL+C to stop\r\n");
|
||||
furi_hal_bt_start_packet_tx(channel, pattern, datarate);
|
||||
|
||||
while(!cli_cmd_interrupt_received(cli)) {
|
||||
osDelay(250);
|
||||
}
|
||||
furi_hal_bt_stop_packet_test();
|
||||
printf("Transmitted %lu packets", furi_hal_bt_get_transmitted_packets());
|
||||
|
||||
} while(false);
|
||||
}
|
||||
|
||||
static void bt_cli_command_packet_rx(Cli* cli, string_t args, void* context) {
|
||||
int channel = 0;
|
||||
int datarate = 1;
|
||||
|
||||
do {
|
||||
if(!args_read_int_and_trim(args, &channel) && (channel < 0 || channel > 39)) {
|
||||
printf("Incorrect or missing channel, expected int 0-39");
|
||||
break;
|
||||
}
|
||||
if(!args_read_int_and_trim(args, &datarate) && (datarate < 1 || datarate > 2)) {
|
||||
printf("Incorrect or missing datarate, expected int 1-2");
|
||||
break;
|
||||
}
|
||||
|
||||
furi_hal_bt_stop_advertising();
|
||||
printf("Receiving packets at %d channel at %d M datarate\r\n", channel, datarate);
|
||||
printf("Press CTRL+C to stop\r\n");
|
||||
furi_hal_bt_start_packet_rx(channel, datarate);
|
||||
|
||||
float rssi_raw = 0;
|
||||
while(!cli_cmd_interrupt_received(cli)) {
|
||||
osDelay(250);
|
||||
rssi_raw = furi_hal_bt_get_rssi();
|
||||
printf("RSSI: %03.1f dB\r", rssi_raw);
|
||||
fflush(stdout);
|
||||
}
|
||||
uint16_t packets_received = furi_hal_bt_stop_packet_test();
|
||||
printf("Received %hu packets", packets_received);
|
||||
} while(false);
|
||||
}
|
||||
|
||||
static void bt_cli_scan_callback(GapAddress address, void* context) {
|
||||
furi_assert(context);
|
||||
osMessageQueueId_t queue = context;
|
||||
osMessageQueuePut(queue, &address, NULL, 250);
|
||||
}
|
||||
|
||||
static void bt_cli_command_scan(Cli* cli, string_t args, void* context) {
|
||||
osMessageQueueId_t queue = osMessageQueueNew(20, sizeof(GapAddress), NULL);
|
||||
furi_hal_bt_start_scan(bt_cli_scan_callback, queue);
|
||||
|
||||
GapAddress address = {};
|
||||
bool exit = false;
|
||||
while(!exit) {
|
||||
if(osMessageQueueGet(queue, &address, NULL, 250) == osOK) {
|
||||
if(address.type < sizeof(bt_cli_address_types)) {
|
||||
printf("Found new device. Type: %s, MAC: ", bt_cli_address_types[address.type]);
|
||||
for(uint8_t i = 0; i < sizeof(address.mac) - 1; i++) {
|
||||
printf("%02X:", address.mac[i]);
|
||||
}
|
||||
printf("%02X\r\n", address.mac[sizeof(address.mac) - 1]);
|
||||
}
|
||||
}
|
||||
exit = cli_cmd_interrupt_received(cli);
|
||||
}
|
||||
furi_hal_bt_stop_tone_tx();
|
||||
if(bt_settings.enabled) {
|
||||
furi_hal_bt_start_advertising();
|
||||
furi_hal_bt_stop_scan();
|
||||
osMessageQueueDelete(queue);
|
||||
}
|
||||
|
||||
static void bt_cli_print_usage() {
|
||||
printf("Usage:\r\n");
|
||||
printf("bt <cmd> <args>\r\n");
|
||||
printf("Cmd list:\r\n");
|
||||
printf("\thci_info\t - HCI info\r\n");
|
||||
if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug) &&
|
||||
furi_hal_bt_get_radio_stack() == FuriHalBtStackHciLayer) {
|
||||
printf("\ttx_carrier <channel:0-39> <power:0-6>\t - start tx carrier test\r\n");
|
||||
printf("\trx_carrier <channel:0-39>\t - start rx carrier test\r\n");
|
||||
printf("\ttx_pt <channel:0-39> <pattern:0-5> <datarate:1-2>\t - start tx packet test\r\n");
|
||||
printf("\trx_pt <channel:0-39> <datarate:1-2>\t - start rx packer test\r\n");
|
||||
printf("\tscan\t - start scanner\r\n");
|
||||
}
|
||||
}
|
||||
|
||||
void bt_cli_command_carrier_rx(Cli* cli, string_t args, void* context) {
|
||||
uint16_t channel;
|
||||
static void bt_cli(Cli* cli, string_t args, void* context) {
|
||||
string_t cmd;
|
||||
string_init(cmd);
|
||||
BtSettings bt_settings;
|
||||
bt_settings_load(&bt_settings);
|
||||
int ret = sscanf(string_get_cstr(args), "%hu", &channel);
|
||||
if(ret != 1) {
|
||||
printf("sscanf returned %d, channel: %hu\r\n", ret, channel);
|
||||
cli_print_usage("bt_rx_carrier", "<Channel number>", string_get_cstr(args));
|
||||
return;
|
||||
}
|
||||
if(channel > 39) {
|
||||
printf("Channel number must be in 0...39 range, not %hu\r\n", channel);
|
||||
return;
|
||||
}
|
||||
|
||||
furi_hal_bt_stop_advertising();
|
||||
printf("Receiving carrier at %hu channel\r\n", channel);
|
||||
printf("Press CTRL+C to stop\r\n");
|
||||
do {
|
||||
if(!args_read_string_and_trim(args, cmd)) {
|
||||
bt_cli_print_usage();
|
||||
break;
|
||||
}
|
||||
if(string_cmp_str(cmd, "hci_info") == 0) {
|
||||
bt_cli_command_hci_info(cli, args, NULL);
|
||||
break;
|
||||
}
|
||||
if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug) &&
|
||||
furi_hal_bt_get_radio_stack() == FuriHalBtStackHciLayer) {
|
||||
if(string_cmp_str(cmd, "carrier_tx") == 0) {
|
||||
bt_cli_command_carrier_tx(cli, args, NULL);
|
||||
break;
|
||||
}
|
||||
if(string_cmp_str(cmd, "carrier_rx") == 0) {
|
||||
bt_cli_command_carrier_rx(cli, args, NULL);
|
||||
break;
|
||||
}
|
||||
if(string_cmp_str(cmd, "packet_tx") == 0) {
|
||||
bt_cli_command_packet_tx(cli, args, NULL);
|
||||
break;
|
||||
}
|
||||
if(string_cmp_str(cmd, "packet_rx") == 0) {
|
||||
bt_cli_command_packet_rx(cli, args, NULL);
|
||||
break;
|
||||
}
|
||||
if(string_cmp_str(cmd, "scan") == 0) {
|
||||
bt_cli_command_scan(cli, args, NULL);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
furi_hal_bt_start_packet_rx(channel, 1);
|
||||
bt_cli_print_usage();
|
||||
} while(false);
|
||||
|
||||
while(!cli_cmd_interrupt_received(cli)) {
|
||||
osDelay(1024 / 4);
|
||||
printf("RSSI: %6.1f dB\r", furi_hal_bt_get_rssi());
|
||||
fflush(stdout);
|
||||
}
|
||||
|
||||
furi_hal_bt_stop_packet_test();
|
||||
if(bt_settings.enabled) {
|
||||
furi_hal_bt_start_advertising();
|
||||
}
|
||||
|
||||
string_clear(cmd);
|
||||
}
|
||||
|
||||
void bt_cli_command_packet_tx(Cli* cli, string_t args, void* context) {
|
||||
uint16_t channel;
|
||||
uint16_t pattern;
|
||||
uint16_t datarate;
|
||||
BtSettings bt_settings;
|
||||
bt_settings_load(&bt_settings);
|
||||
int ret = sscanf(string_get_cstr(args), "%hu %hu %hu", &channel, &pattern, &datarate);
|
||||
if(ret != 3) {
|
||||
printf("sscanf returned %d, channel: %hu %hu %hu\r\n", ret, channel, pattern, datarate);
|
||||
cli_print_usage(
|
||||
"bt_tx_pt", "<Channel number> <Pattern> <Datarate>", string_get_cstr(args));
|
||||
return;
|
||||
}
|
||||
if(channel > 39) {
|
||||
printf("Channel number must be in 0...39 range, not %hu\r\n", channel);
|
||||
return;
|
||||
}
|
||||
if(pattern > 5) {
|
||||
printf("Pattern must be in 0...5 range, not %hu\r\n", pattern);
|
||||
printf("0 - Pseudo-Random bit sequence 9\r\n");
|
||||
printf("1 - Pattern of alternating bits '11110000'\r\n");
|
||||
printf("2 - Pattern of alternating bits '10101010'\r\n");
|
||||
printf("3 - Pseudo-Random bit sequence 15\r\n");
|
||||
printf("4 - Pattern of All '1' bits\r\n");
|
||||
printf("5 - Pattern of All '0' bits\r\n");
|
||||
return;
|
||||
}
|
||||
if(datarate < 1 || datarate > 2) {
|
||||
printf("Datarate must be in 1 or 2 Mb, not %hu\r\n", datarate);
|
||||
return;
|
||||
}
|
||||
|
||||
furi_hal_bt_stop_advertising();
|
||||
printf(
|
||||
"Transmitting %hu pattern packet at %hu channel at %hu M datarate\r\n",
|
||||
pattern,
|
||||
channel,
|
||||
datarate);
|
||||
printf("Press CTRL+C to stop\r\n");
|
||||
furi_hal_bt_start_packet_tx(channel, pattern, datarate);
|
||||
|
||||
while(!cli_cmd_interrupt_received(cli)) {
|
||||
osDelay(250);
|
||||
}
|
||||
furi_hal_bt_stop_packet_test();
|
||||
printf("Transmitted %lu packets", furi_hal_bt_get_transmitted_packets());
|
||||
if(bt_settings.enabled) {
|
||||
furi_hal_bt_start_advertising();
|
||||
}
|
||||
}
|
||||
|
||||
void bt_cli_command_packet_rx(Cli* cli, string_t args, void* context) {
|
||||
uint16_t channel;
|
||||
uint16_t datarate;
|
||||
BtSettings bt_settings;
|
||||
bt_settings_load(&bt_settings);
|
||||
int ret = sscanf(string_get_cstr(args), "%hu %hu", &channel, &datarate);
|
||||
if(ret != 2) {
|
||||
printf("sscanf returned %d, channel: %hu datarate: %hu\r\n", ret, channel, datarate);
|
||||
cli_print_usage("bt_rx_pt", "<Channel number> <Datarate>", string_get_cstr(args));
|
||||
return;
|
||||
}
|
||||
if(channel > 39) {
|
||||
printf("Channel number must be in 0...39 range, not %hu\r\n", channel);
|
||||
return;
|
||||
}
|
||||
if(datarate < 1 || datarate > 2) {
|
||||
printf("Datarate must be in 1 or 2 Mb, not %hu\r\n", datarate);
|
||||
return;
|
||||
}
|
||||
|
||||
furi_hal_bt_stop_advertising();
|
||||
printf("Receiving packets at %hu channel at %hu M datarate\r\n", channel, datarate);
|
||||
printf("Press CTRL+C to stop\r\n");
|
||||
furi_hal_bt_start_packet_rx(channel, datarate);
|
||||
|
||||
float rssi_raw = 0;
|
||||
while(!cli_cmd_interrupt_received(cli)) {
|
||||
osDelay(250);
|
||||
rssi_raw = furi_hal_bt_get_rssi();
|
||||
printf("RSSI: %03.1f dB\r", rssi_raw);
|
||||
fflush(stdout);
|
||||
}
|
||||
uint16_t packets_received = furi_hal_bt_stop_packet_test();
|
||||
printf("Received %hu packets", packets_received);
|
||||
if(bt_settings.enabled) {
|
||||
furi_hal_bt_start_advertising();
|
||||
}
|
||||
void bt_on_system_start() {
|
||||
#ifdef SRV_CLI
|
||||
Cli* cli = furi_record_open("cli");
|
||||
furi_record_open("bt");
|
||||
cli_add_command(cli, "bt", CliCommandFlagDefault, bt_cli, NULL);
|
||||
furi_record_close("bt");
|
||||
furi_record_close("cli");
|
||||
#endif
|
||||
}
|
||||
|
@@ -1,15 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include <cli/cli.h>
|
||||
|
||||
void bt_on_system_start();
|
||||
|
||||
void bt_cli_command_info(Cli* cli, string_t args, void* context);
|
||||
|
||||
void bt_cli_command_carrier_tx(Cli* cli, string_t args, void* context);
|
||||
|
||||
void bt_cli_command_carrier_rx(Cli* cli, string_t args, void* context);
|
||||
|
||||
void bt_cli_command_packet_tx(Cli* cli, string_t args, void* context);
|
||||
|
||||
void bt_cli_command_packet_rx(Cli* cli, string_t args, void* context);
|
9
applications/bt/bt_debug_app/bt_debug_app.c
Executable file → Normal file
9
applications/bt/bt_debug_app/bt_debug_app.c
Executable file → Normal file
@@ -1,6 +1,8 @@
|
||||
#include "bt_debug_app.h"
|
||||
#include <furi-hal-bt.h>
|
||||
|
||||
#define TAG "BtDebugApp"
|
||||
|
||||
enum BtDebugSubmenuIndex {
|
||||
BtDebugSubmenuIndexCarrierTest,
|
||||
BtDebugSubmenuIndexPacketTest,
|
||||
@@ -92,6 +94,13 @@ void bt_debug_app_free(BtDebugApp* app) {
|
||||
}
|
||||
|
||||
int32_t bt_debug_app(void* p) {
|
||||
if(furi_hal_bt_get_radio_stack() != FuriHalBtStackHciLayer) {
|
||||
FURI_LOG_E(TAG, "Incorrect radio stack, replace with HciLayer for tests.");
|
||||
DialogsApp* dialogs = furi_record_open("dialogs");
|
||||
dialog_message_show_storage_error(dialogs, "Incorrect\nRadioStack");
|
||||
return 255;
|
||||
}
|
||||
|
||||
BtDebugApp* app = bt_debug_app_alloc();
|
||||
// Stop advertising
|
||||
furi_hal_bt_stop_advertising();
|
||||
|
@@ -4,6 +4,7 @@
|
||||
#include <gui/gui.h>
|
||||
#include <gui/view.h>
|
||||
#include <gui/view_dispatcher.h>
|
||||
#include <dialogs/dialogs.h>
|
||||
|
||||
#include <gui/modules/submenu.h>
|
||||
#include "views/bt_carrier_test.h"
|
||||
|
@@ -154,12 +154,12 @@ static void bt_rpc_send_bytes_callback(void* context, uint8_t* bytes, size_t byt
|
||||
}
|
||||
|
||||
// Called from GAP thread
|
||||
static bool bt_on_gap_event_callback(BleEvent event, void* context) {
|
||||
static bool bt_on_gap_event_callback(GapEvent event, void* context) {
|
||||
furi_assert(context);
|
||||
Bt* bt = context;
|
||||
bool ret = false;
|
||||
|
||||
if(event.type == BleEventTypeConnected) {
|
||||
if(event.type == GapEventTypeConnected) {
|
||||
// Update status bar
|
||||
bt->status = BtStatusConnected;
|
||||
BtMessage message = {.type = BtMessageTypeUpdateStatusbar};
|
||||
@@ -181,7 +181,7 @@ static bool bt_on_gap_event_callback(BleEvent event, void* context) {
|
||||
message.data.battery_level = info.charge;
|
||||
furi_check(osMessageQueuePut(bt->message_queue, &message, 0, osWaitForever) == osOK);
|
||||
ret = true;
|
||||
} else if(event.type == BleEventTypeDisconnected) {
|
||||
} else if(event.type == GapEventTypeDisconnected) {
|
||||
if(bt->profile == BtProfileSerial && bt->rpc_session) {
|
||||
FURI_LOG_I(TAG, "Close RPC connection");
|
||||
osEventFlagsSet(bt->rpc_event, BT_RPC_EVENT_DISCONNECTED);
|
||||
@@ -190,24 +190,24 @@ static bool bt_on_gap_event_callback(BleEvent event, void* context) {
|
||||
bt->rpc_session = NULL;
|
||||
}
|
||||
ret = true;
|
||||
} else if(event.type == BleEventTypeStartAdvertising) {
|
||||
} else if(event.type == GapEventTypeStartAdvertising) {
|
||||
bt->status = BtStatusAdvertising;
|
||||
BtMessage message = {.type = BtMessageTypeUpdateStatusbar};
|
||||
furi_check(osMessageQueuePut(bt->message_queue, &message, 0, osWaitForever) == osOK);
|
||||
ret = true;
|
||||
} else if(event.type == BleEventTypeStopAdvertising) {
|
||||
} else if(event.type == GapEventTypeStopAdvertising) {
|
||||
bt->status = BtStatusOff;
|
||||
BtMessage message = {.type = BtMessageTypeUpdateStatusbar};
|
||||
furi_check(osMessageQueuePut(bt->message_queue, &message, 0, osWaitForever) == osOK);
|
||||
ret = true;
|
||||
} else if(event.type == BleEventTypePinCodeShow) {
|
||||
} else if(event.type == GapEventTypePinCodeShow) {
|
||||
BtMessage message = {
|
||||
.type = BtMessageTypePinCodeShow, .data.pin_code = event.data.pin_code};
|
||||
furi_check(osMessageQueuePut(bt->message_queue, &message, 0, osWaitForever) == osOK);
|
||||
ret = true;
|
||||
} else if(event.type == BleEventTypePinCodeVerify) {
|
||||
} else if(event.type == GapEventTypePinCodeVerify) {
|
||||
ret = bt_pin_code_verify_event_handler(bt, event.data.pin_code);
|
||||
} else if(event.type == BleEventTypeUpdateMTU) {
|
||||
} else if(event.type == GapEventTypeUpdateMTU) {
|
||||
bt->max_packet_size = event.data.max_packet_size;
|
||||
ret = true;
|
||||
}
|
||||
@@ -234,33 +234,45 @@ static void bt_statusbar_update(Bt* bt) {
|
||||
}
|
||||
}
|
||||
|
||||
static void bt_show_warning(Bt* bt, const char* text) {
|
||||
dialog_message_set_text(bt->dialog_message, text, 64, 28, AlignCenter, AlignCenter);
|
||||
dialog_message_set_buttons(bt->dialog_message, "Quit", NULL, NULL);
|
||||
dialog_message_show(bt->dialogs, bt->dialog_message);
|
||||
}
|
||||
|
||||
static void bt_change_profile(Bt* bt, BtMessage* message) {
|
||||
bt_settings_load(&bt->bt_settings);
|
||||
if(bt->profile == BtProfileSerial && bt->rpc_session) {
|
||||
FURI_LOG_I(TAG, "Close RPC connection");
|
||||
osEventFlagsSet(bt->rpc_event, BT_RPC_EVENT_DISCONNECTED);
|
||||
rpc_session_close(bt->rpc_session);
|
||||
furi_hal_bt_serial_set_event_callback(0, NULL, NULL);
|
||||
bt->rpc_session = NULL;
|
||||
}
|
||||
|
||||
FuriHalBtProfile furi_profile;
|
||||
if(message->data.profile == BtProfileHidKeyboard) {
|
||||
furi_profile = FuriHalBtProfileHidKeyboard;
|
||||
} else {
|
||||
furi_profile = FuriHalBtProfileSerial;
|
||||
}
|
||||
|
||||
if(furi_hal_bt_change_app(furi_profile, bt_on_gap_event_callback, bt)) {
|
||||
FURI_LOG_I(TAG, "Bt App started");
|
||||
if(bt->bt_settings.enabled) {
|
||||
furi_hal_bt_start_advertising();
|
||||
FuriHalBtStack stack = furi_hal_bt_get_radio_stack();
|
||||
if(stack == FuriHalBtStackLight) {
|
||||
bt_settings_load(&bt->bt_settings);
|
||||
if(bt->profile == BtProfileSerial && bt->rpc_session) {
|
||||
FURI_LOG_I(TAG, "Close RPC connection");
|
||||
osEventFlagsSet(bt->rpc_event, BT_RPC_EVENT_DISCONNECTED);
|
||||
rpc_session_close(bt->rpc_session);
|
||||
furi_hal_bt_serial_set_event_callback(0, NULL, NULL);
|
||||
bt->rpc_session = NULL;
|
||||
}
|
||||
|
||||
FuriHalBtProfile furi_profile;
|
||||
if(message->data.profile == BtProfileHidKeyboard) {
|
||||
furi_profile = FuriHalBtProfileHidKeyboard;
|
||||
} else {
|
||||
furi_profile = FuriHalBtProfileSerial;
|
||||
}
|
||||
|
||||
if(furi_hal_bt_change_app(furi_profile, bt_on_gap_event_callback, bt)) {
|
||||
FURI_LOG_I(TAG, "Bt App started");
|
||||
if(bt->bt_settings.enabled) {
|
||||
furi_hal_bt_start_advertising();
|
||||
}
|
||||
furi_hal_bt_set_key_storage_change_callback(bt_on_key_storage_change_callback, bt);
|
||||
bt->profile = message->data.profile;
|
||||
*message->result = true;
|
||||
} else {
|
||||
FURI_LOG_E(TAG, "Failed to start Bt App");
|
||||
*message->result = false;
|
||||
}
|
||||
furi_hal_bt_set_key_storage_change_callback(bt_on_key_storage_change_callback, bt);
|
||||
bt->profile = message->data.profile;
|
||||
*message->result = true;
|
||||
} else {
|
||||
FURI_LOG_E(TAG, "Failed to start Bt App");
|
||||
bt_show_warning(bt, "Radio stack doesn't support this app");
|
||||
*message->result = false;
|
||||
}
|
||||
osEventFlagsSet(bt->api_event, BT_API_UNLOCK_EVENT);
|
||||
@@ -268,26 +280,35 @@ static void bt_change_profile(Bt* bt, BtMessage* message) {
|
||||
|
||||
int32_t bt_srv() {
|
||||
Bt* bt = bt_alloc();
|
||||
furi_record_create("bt", bt);
|
||||
|
||||
// Read keys
|
||||
if(!bt_load_key_storage(bt)) {
|
||||
FURI_LOG_W(TAG, "Failed to load bonding keys");
|
||||
}
|
||||
|
||||
// Start BLE stack
|
||||
if(furi_hal_bt_start_app(FuriHalBtProfileSerial, bt_on_gap_event_callback, bt)) {
|
||||
FURI_LOG_I(TAG, "BLE stack started");
|
||||
if(bt->bt_settings.enabled) {
|
||||
furi_hal_bt_start_advertising();
|
||||
// Start radio stack
|
||||
if(!furi_hal_bt_start_radio_stack()) {
|
||||
FURI_LOG_E(TAG, "Radio stack start failed");
|
||||
}
|
||||
FuriHalBtStack stack_type = furi_hal_bt_get_radio_stack();
|
||||
|
||||
if(stack_type == FuriHalBtStackUnknown) {
|
||||
bt_show_warning(bt, "Unsupported radio stack");
|
||||
bt->status = BtStatusUnavailable;
|
||||
} else if(stack_type == FuriHalBtStackHciLayer) {
|
||||
bt->status = BtStatusUnavailable;
|
||||
} else if(stack_type == FuriHalBtStackLight) {
|
||||
if(!furi_hal_bt_start_app(FuriHalBtProfileSerial, bt_on_gap_event_callback, bt)) {
|
||||
FURI_LOG_E(TAG, "BLE App start failed");
|
||||
} else {
|
||||
if(bt->bt_settings.enabled) {
|
||||
furi_hal_bt_start_advertising();
|
||||
}
|
||||
furi_hal_bt_set_key_storage_change_callback(bt_on_key_storage_change_callback, bt);
|
||||
}
|
||||
furi_hal_bt_set_key_storage_change_callback(bt_on_key_storage_change_callback, bt);
|
||||
} else {
|
||||
FURI_LOG_E(TAG, "BT App start failed");
|
||||
}
|
||||
|
||||
// Update statusbar
|
||||
bt_statusbar_update(bt);
|
||||
furi_record_create("bt", bt);
|
||||
|
||||
BtMessage message;
|
||||
while(1) {
|
||||
|
@@ -10,6 +10,7 @@ extern "C" {
|
||||
typedef struct Bt Bt;
|
||||
|
||||
typedef enum {
|
||||
BtStatusUnavailable,
|
||||
BtStatusOff,
|
||||
BtStatusAdvertising,
|
||||
BtStatusConnected,
|
||||
|
@@ -23,20 +23,26 @@ static void bt_settings_scene_start_var_list_change_callback(VariableItem* item)
|
||||
void bt_settings_scene_start_on_enter(void* context) {
|
||||
BtSettingsApp* app = context;
|
||||
VariableItemList* var_item_list = app->var_item_list;
|
||||
|
||||
VariableItem* item;
|
||||
item = variable_item_list_add(
|
||||
var_item_list,
|
||||
"Bluetooth",
|
||||
BtSettingNum,
|
||||
bt_settings_scene_start_var_list_change_callback,
|
||||
app);
|
||||
if(app->settings.enabled) {
|
||||
variable_item_set_current_value_index(item, BtSettingOn);
|
||||
variable_item_set_current_value_text(item, bt_settings_text[BtSettingOn]);
|
||||
|
||||
FuriHalBtStack stack_type = furi_hal_bt_get_radio_stack();
|
||||
if(stack_type == FuriHalBtStackLight) {
|
||||
item = variable_item_list_add(
|
||||
var_item_list,
|
||||
"Bluetooth",
|
||||
BtSettingNum,
|
||||
bt_settings_scene_start_var_list_change_callback,
|
||||
app);
|
||||
if(app->settings.enabled) {
|
||||
variable_item_set_current_value_index(item, BtSettingOn);
|
||||
variable_item_set_current_value_text(item, bt_settings_text[BtSettingOn]);
|
||||
} else {
|
||||
variable_item_set_current_value_index(item, BtSettingOff);
|
||||
variable_item_set_current_value_text(item, bt_settings_text[BtSettingOff]);
|
||||
}
|
||||
} else {
|
||||
variable_item_set_current_value_index(item, BtSettingOff);
|
||||
variable_item_set_current_value_text(item, bt_settings_text[BtSettingOff]);
|
||||
item = variable_item_list_add(var_item_list, "Bluetooth", 1, NULL, NULL);
|
||||
variable_item_set_current_value_text(item, "Broken");
|
||||
}
|
||||
|
||||
view_dispatcher_switch_to_view(app->view_dispatcher, BtSettingsAppViewVarItemList);
|
||||
|
Reference in New Issue
Block a user