diff options
author | あく <alleteam@gmail.com> | 2021-08-08 21:03:25 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-08 21:03:25 +0300 |
commit | 0a97d6913c1a48156e3e2d8f339e027a003f948f (patch) | |
tree | d02cd7895df05654c4e106a28055333fd976228a /applications/bt | |
parent | 7907cb232bda5af7c30c79c67ab353b2cefe57c8 (diff) |
Rename api-hal to furi-hal (#629)
Diffstat (limited to 'applications/bt')
-rw-r--r-- | applications/bt/bt.c | 38 | ||||
-rw-r--r-- | applications/bt/bt_cli.c | 26 | ||||
-rw-r--r-- | applications/bt/bt_i.h | 2 |
3 files changed, 33 insertions, 33 deletions
diff --git a/applications/bt/bt.c b/applications/bt/bt.c index 7b8bbdc6..41974f65 100644 --- a/applications/bt/bt.c +++ b/applications/bt/bt.c @@ -153,24 +153,24 @@ int32_t bt_srv() { furi_record_create("bt", bt); - api_hal_bt_init(); + furi_hal_bt_init(); BtMessage message; while(1) { furi_check(osMessageQueueGet(bt->message_queue, &message, NULL, osWaitForever) == osOK); if(message.type == BtMessageTypeStartTestCarrier) { // Start carrier test - api_hal_bt_stop_tone_tx(); + furi_hal_bt_stop_tone_tx(); if(bt->state.type == BtStateCarrierTx) { - api_hal_bt_start_tone_tx(message.param.channel, message.param.power); + furi_hal_bt_start_tone_tx(message.param.channel, message.param.power); } else if(bt->state.type == BtStateHoppingTx) { bt->state.param.channel = bt_switch_channel(InputKeyRight, bt->state.param.channel); - api_hal_bt_start_tone_tx(bt->state.param.channel, bt->state.param.power); + furi_hal_bt_start_tone_tx(bt->state.param.channel, bt->state.param.power); } else if(bt->state.type == BtStateCarrierRxStart) { - api_hal_bt_start_packet_rx(bt->state.param.channel, bt->state.param.datarate); + furi_hal_bt_start_packet_rx(bt->state.param.channel, bt->state.param.datarate); bt->state.type = BtStateCarrierRxRunning; } else if(bt->state.type == BtStateCarrierRxRunning) { - bt->state.param.rssi = api_hal_bt_get_rssi(); + bt->state.param.rssi = furi_hal_bt_get_rssi(); } with_view_model( bt->view_test_carrier, (BtViewTestCarrierModel * model) { @@ -183,14 +183,14 @@ int32_t bt_srv() { view_dispatcher_switch_to_view(bt->view_dispatcher, BtViewTestCarrier); } else if(message.type == BtMessageTypeStopTestCarrier) { if(bt->state.type == BtStateCarrierRxRunning) { - api_hal_bt_stop_packet_test(); + furi_hal_bt_stop_packet_test(); } else { - api_hal_bt_stop_tone_tx(); + furi_hal_bt_stop_tone_tx(); } bt->state.type = BtStateReady; } else if(message.type == BtMessageTypeSetupTestPacketTx) { // Update packet test setup - api_hal_bt_stop_packet_test(); + furi_hal_bt_stop_packet_test(); with_view_model( bt->view_test_packet_tx, (BtViewTestPacketTxModel * model) { model->type = bt->state.type; @@ -202,10 +202,10 @@ int32_t bt_srv() { } else if(message.type == BtMessageTypeStartTestPacketTx) { // Start sending packets if(bt->state.type == BtStatePacketStart) { - api_hal_bt_start_packet_tx(message.param.channel, 1, message.param.datarate); + furi_hal_bt_start_packet_tx(message.param.channel, 1, message.param.datarate); } else if(bt->state.type == BtStatePacketSetup) { - api_hal_bt_stop_packet_test(); - bt->state.param.packets_sent = api_hal_bt_get_transmitted_packets(); + furi_hal_bt_stop_packet_test(); + bt->state.param.packets_sent = furi_hal_bt_get_transmitted_packets(); } with_view_model( bt->view_test_packet_tx, (BtViewTestPacketTxModel * model) { @@ -218,7 +218,7 @@ int32_t bt_srv() { view_dispatcher_switch_to_view(bt->view_dispatcher, BtViewTestPacketTx); } else if(message.type == BtMessageTypeSetupTestPacketRx) { // Update packet test setup - api_hal_bt_stop_packet_test(); + furi_hal_bt_stop_packet_test(); with_view_model( bt->view_test_packet_rx, (BtViewTestPacketRxModel * model) { model->type = bt->state.type; @@ -230,12 +230,12 @@ int32_t bt_srv() { } else if(message.type == BtMessageTypeStartTestPacketRx) { // Start test rx if(bt->state.type == BtStatePacketStart) { - api_hal_bt_start_packet_rx(message.param.channel, message.param.datarate); + furi_hal_bt_start_packet_rx(message.param.channel, message.param.datarate); bt->state.type = BtStatePacketRunning; } else if(bt->state.type == BtStatePacketRunning) { - bt->state.param.rssi = api_hal_bt_get_rssi(); + bt->state.param.rssi = furi_hal_bt_get_rssi(); } else if(bt->state.type == BtStatePacketSetup) { - bt->state.param.packets_received = api_hal_bt_stop_packet_test(); + bt->state.param.packets_received = furi_hal_bt_stop_packet_test(); } with_view_model( bt->view_test_packet_rx, (BtViewTestPacketRxModel * model) { @@ -249,17 +249,17 @@ int32_t bt_srv() { view_dispatcher_switch_to_view(bt->view_dispatcher, BtViewTestPacketRx); } else if(message.type == BtMessageTypeStopTestPacket) { // Stop test packet tx - api_hal_bt_stop_packet_test(); + furi_hal_bt_stop_packet_test(); bt->state.type = BtStateReady; } else if(message.type == BtMessageTypeStartApp) { // Start app view_dispatcher_switch_to_view(bt->view_dispatcher, BtViewStartApp); - if(api_hal_bt_start_app()) { + if(furi_hal_bt_start_app()) { bt->state.type = BtStateStartedApp; } } else if(message.type == BtMessageTypeUpdateStatusbar) { // Update statusbar - view_port_enabled_set(bt->statusbar_view_port, api_hal_bt_is_alive()); + view_port_enabled_set(bt->statusbar_view_port, furi_hal_bt_is_alive()); } } return 0; diff --git a/applications/bt/bt_cli.c b/applications/bt/bt_cli.c index 3c325003..47a05d06 100644 --- a/applications/bt/bt_cli.c +++ b/applications/bt/bt_cli.c @@ -1,6 +1,6 @@ #include "bt_cli.h" #include <furi.h> -#include <api-hal.h> +#include <furi-hal.h> void bt_cli_init() { Cli* cli = furi_record_open("cli"); @@ -17,7 +17,7 @@ void bt_cli_init() { void bt_cli_command_info(Cli* cli, string_t args, void* context) { string_t buffer; string_init(buffer); - api_hal_bt_dump_state(buffer); + furi_hal_bt_dump_state(buffer); printf(string_get_cstr(buffer)); string_clear(buffer); } @@ -41,12 +41,12 @@ void bt_cli_command_carrier_tx(Cli* cli, string_t args, void* context) { } printf("Transmitting carrier at %hu channel at %hu dB power\r\n", channel, power); printf("Press CTRL+C to stop\r\n"); - api_hal_bt_start_tone_tx(channel, 0x19 + power); + furi_hal_bt_start_tone_tx(channel, 0x19 + power); while(!cli_cmd_interrupt_received(cli)) { osDelay(250); } - api_hal_bt_stop_tone_tx(); + furi_hal_bt_stop_tone_tx(); } void bt_cli_command_carrier_rx(Cli* cli, string_t args, void* context) { @@ -64,15 +64,15 @@ void bt_cli_command_carrier_rx(Cli* cli, string_t args, void* context) { printf("Receiving carrier at %hu channel\r\n", channel); printf("Press CTRL+C to stop\r\n"); - api_hal_bt_start_packet_rx(channel, 1); + furi_hal_bt_start_packet_rx(channel, 1); while(!cli_cmd_interrupt_received(cli)) { osDelay(1024 / 4); - printf("RSSI: %6.1f dB\r", api_hal_bt_get_rssi()); + printf("RSSI: %6.1f dB\r", furi_hal_bt_get_rssi()); fflush(stdout); } - api_hal_bt_stop_packet_test(); + furi_hal_bt_stop_packet_test(); } void bt_cli_command_packet_tx(Cli* cli, string_t args, void* context) { @@ -111,13 +111,13 @@ void bt_cli_command_packet_tx(Cli* cli, string_t args, void* context) { channel, datarate); printf("Press CTRL+C to stop\r\n"); - api_hal_bt_start_packet_tx(channel, pattern, datarate); + furi_hal_bt_start_packet_tx(channel, pattern, datarate); while(!cli_cmd_interrupt_received(cli)) { osDelay(250); } - api_hal_bt_stop_packet_test(); - printf("Transmitted %lu packets", api_hal_bt_get_transmitted_packets()); + furi_hal_bt_stop_packet_test(); + printf("Transmitted %lu packets", furi_hal_bt_get_transmitted_packets()); } void bt_cli_command_packet_rx(Cli* cli, string_t args, void* context) { @@ -139,15 +139,15 @@ void bt_cli_command_packet_rx(Cli* cli, string_t args, void* context) { } printf("Receiving packets at %hu channel at %hu M datarate\r\n", channel, datarate); printf("Press CTRL+C to stop\r\n"); - api_hal_bt_start_packet_rx(channel, datarate); + furi_hal_bt_start_packet_rx(channel, datarate); float rssi_raw = 0; while(!cli_cmd_interrupt_received(cli)) { osDelay(250); - rssi_raw = api_hal_bt_get_rssi(); + rssi_raw = furi_hal_bt_get_rssi(); printf("RSSI: %03.1f dB\r", rssi_raw); fflush(stdout); } - uint16_t packets_received = api_hal_bt_stop_packet_test(); + uint16_t packets_received = furi_hal_bt_stop_packet_test(); printf("Received %hu packets", packets_received); } diff --git a/applications/bt/bt_i.h b/applications/bt/bt_i.h index 8d45836b..6a5fe383 100644 --- a/applications/bt/bt_i.h +++ b/applications/bt/bt_i.h @@ -5,7 +5,7 @@ #include "bt_types.h" #include <furi.h> -#include <api-hal.h> +#include <furi-hal.h> #include <cli/cli.h> |