Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

API: Move furi_hal_bt_reverse_mac_addr() out of API

Browse Source
This commit is contained in:
Willy-JL
2024-11-08 04:47:54 +00:00
parent 5d4051e90e
commit aee7c2c5bb
12 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/system/findmy/findmy.c
View File

@@ -131,7 +131,7 @@ void findmy_set_tag_type(FindMy* app, FindMyType type) {
findmy_main_update_type(app->findmy_main, type);
}
void furi_hal_bt_reverse_mac_addr(uint8_t mac_addr[GAP_MAC_ADDR_SIZE]) {
void reverse_mac_addr(uint8_t mac_addr[GAP_MAC_ADDR_SIZE]) {
uint8_t tmp;
for(size_t i = 0; i < GAP_MAC_ADDR_SIZE / 2; i++) {
tmp = mac_addr[i];

5
applications/system/findmy/findmy_i.h
View File

@@ -20,9 +20,8 @@
#include <gui/modules/popup.h>
#include "scenes/findmy_scene.h"
#include "helpers/base64.h"
#ifdef FW_ORIGIN_Official
void furi_hal_bt_reverse_mac_addr(uint8_t mac_addr[GAP_MAC_ADDR_SIZE]);
#endif
void reverse_mac_addr(uint8_t mac_addr[GAP_MAC_ADDR_SIZE]);
struct FindMy {
Gui* gui;

4
applications/system/findmy/scenes/findmy_scene_config_import.c
View File

@@ -28,7 +28,7 @@ static const char* parse_nrf_connect(FindMy* app, const char* path) {
}
}
if(error) break;
furi_hal_bt_reverse_mac_addr(mac);
reverse_mac_addr(mac);
error = "Can't open file";
if(!file_stream_open(stream, path, FSAM_READ, FSOM_OPEN_EXISTING)) break;
@@ -109,7 +109,7 @@ static const char* parse_open_haystack(FindMy* app, const char* path) {
memcpy(app->state.mac, public_key, sizeof(app->state.mac));
app->state.mac[0] |= 0b11000000;
furi_hal_bt_reverse_mac_addr(app->state.mac);
reverse_mac_addr(app->state.mac);
uint8_t advertisement_template[EXTRA_BEACON_MAX_DATA_SIZE] = {
0x1e, // length (30)

4
applications/system/findmy/scenes/findmy_scene_config_mac.c
View File

@@ -17,7 +17,7 @@ void findmy_scene_config_mac_on_enter(void* context) {
byte_input_set_header_text(byte_input, "Enter Bluetooth MAC:");
memcpy(app->mac_buf, app->state.mac, sizeof(app->mac_buf));
furi_hal_bt_reverse_mac_addr(app->mac_buf);
reverse_mac_addr(app->mac_buf);
byte_input_set_result_callback(
byte_input,
@@ -38,7 +38,7 @@ bool findmy_scene_config_mac_on_event(void* context, SceneManagerEvent event) {
consumed = true;
switch(event.event) {
case ByteInputResultOk:
furi_hal_bt_reverse_mac_addr(app->mac_buf);
reverse_mac_addr(app->mac_buf);
memcpy(&app->state.mac, app->mac_buf, sizeof(app->state.mac));
findmy_state_save_and_apply(&app->state);
findmy_main_update_mac(app->findmy_main, app->state.mac);

2
applications/system/findmy/views/findmy_main.c
View File

@@ -177,7 +177,7 @@ void findmy_main_update_mac(FindMyMain* findmy_main, uint8_t* mac) {
FindMyMainModel * model,
{
memcpy(model->mac, mac, sizeof(model->mac));
furi_hal_bt_reverse_mac_addr(model->mac);
reverse_mac_addr(model->mac);
},
true);
}