Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-26 05:54:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

FindMy: Refactors and improvements

Browse Source 
- state handled reparately, decoupled from app
- better apple/samsung/unknown parsing and handling
- improve error handling
- add url to manifest + up stack size just in case
This commit is contained in:
Willy-JL
2024-03-08 20:53:00 +00:00
parent 09af215e75
commit 7c48c6164a
12 changed files with 176 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
applications/system/findmy/scenes/findmy_scene_config.c
View File

@@ -12,9 +12,9 @@ void findmy_scene_config_broadcast_interval_changed(VariableItem* item) {
uint8_t index = variable_item_get_current_value_index(item);
findmy_change_broadcast_interval(app, index + 1);
char str[5];
snprintf(str, sizeof(str), "%ds", app->broadcast_interval);
snprintf(str, sizeof(str), "%ds", app->state.broadcast_interval);
variable_item_set_current_value_text(item, str);
variable_item_set_current_value_index(item, app->broadcast_interval - 1);
variable_item_set_current_value_index(item, app->state.broadcast_interval - 1);
}
void findmy_scene_config_transmit_power_changed(VariableItem* item) {
@@ -22,9 +22,9 @@ void findmy_scene_config_transmit_power_changed(VariableItem* item) {
uint8_t index = variable_item_get_current_value_index(item);
findmy_change_transmit_power(app, index);
char str[7];
snprintf(str, sizeof(str), "%ddBm", app->transmit_power);
snprintf(str, sizeof(str), "%ddBm", app->state.transmit_power);
variable_item_set_current_value_text(item, str);
variable_item_set_current_value_index(item, app->transmit_power);
variable_item_set_current_value_index(item, app->state.transmit_power);
}
void findmy_scene_config_callback(void* context, uint32_t index) {
@@ -45,17 +45,17 @@ void findmy_scene_config_on_enter(void* context) {
findmy_scene_config_broadcast_interval_changed,
app);
// Broadcast Interval is 1-10, so use 0-9 and offset indexes by 1
variable_item_set_current_value_index(item, app->broadcast_interval - 1);
char broadcast_interval_s[5];
snprintf(broadcast_interval_s, sizeof(broadcast_interval_s), "%ds", app->broadcast_interval);
variable_item_set_current_value_text(item, broadcast_interval_s);
variable_item_set_current_value_index(item, app->state.broadcast_interval - 1);
char interval_str[5];
snprintf(interval_str, sizeof(interval_str), "%ds", app->state.broadcast_interval);
variable_item_set_current_value_text(item, interval_str);
item = variable_item_list_add(
var_item_list, "Transmit Power", 7, findmy_scene_config_transmit_power_changed, app);
variable_item_set_current_value_index(item, app->transmit_power);
char transmit_power_s[7];
snprintf(transmit_power_s, sizeof(transmit_power_s), "%ddBm", app->transmit_power);
variable_item_set_current_value_text(item, transmit_power_s);
variable_item_set_current_value_index(item, app->state.transmit_power);
char power_str[7];
snprintf(power_str, sizeof(power_str), "%ddBm", app->state.transmit_power);
variable_item_set_current_value_text(item, power_str);
item = variable_item_list_add(var_item_list, "Register Tag", 0, NULL, NULL);
item = variable_item_list_add(

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

@@ -16,7 +16,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->config.address, sizeof(app->mac_buf));
memcpy(app->mac_buf, app->state.mac, sizeof(app->mac_buf));
furi_hal_bt_reverse_mac_addr(app->mac_buf);
byte_input_set_result_callback(
@@ -39,8 +39,15 @@ bool findmy_scene_config_mac_on_event(void* context, SceneManagerEvent event) {
switch(event.event) {
case ByteInputResultOk:
furi_hal_bt_reverse_mac_addr(app->mac_buf);
memcpy(&app->config.address, app->mac_buf, sizeof(app->config.address));
furi_hal_bt_extra_beacon_set_config(&app->config);
memcpy(&app->state.mac, app->mac_buf, sizeof(app->state.mac));
memcpy(&app->state.config.address, app->mac_buf, sizeof(app->state.config.address));
if(furi_hal_bt_extra_beacon_is_active()) {
furi_check(furi_hal_bt_extra_beacon_stop());
}
furi_check(furi_hal_bt_extra_beacon_set_config(&app->state.config));
if(app->state.beacon_active) {
furi_check(furi_hal_bt_extra_beacon_start());
}
scene_manager_next_scene(app->scene_manager, FindMySceneConfigPacket);
break;
default:

13
applications/system/findmy/scenes/findmy_scene_config_packet.c
View File

@@ -16,8 +16,7 @@ void findmy_scene_config_packet_on_enter(void* context) {
byte_input_set_header_text(byte_input, "Enter Bluetooth Payload:");
memset(app->packet_buf, 0, sizeof(app->packet_buf));
furi_hal_bt_extra_beacon_get_data(app->packet_buf);
memcpy(app->packet_buf, app->state.data, sizeof(app->packet_buf));
byte_input_set_result_callback(
byte_input,
@@ -40,14 +39,10 @@ bool findmy_scene_config_packet_on_event(void* context, SceneManagerEvent event)
case ByteInputResultOk:
scene_manager_search_and_switch_to_previous_scene(
app->scene_manager, FindMySceneConfig);
memcpy(app->state.data, app->packet_buf, sizeof(app->state.data));
furi_check(
furi_hal_bt_extra_beacon_set_data(app->packet_buf, sizeof(app->packet_buf)));
if(app->packet_buf[0] == 0x1E && app->packet_buf[3] == 0x00) {
app->apple = true; // Checks payload data for Apple identifier
} else {
app->apple = false;
}
findmy_main_update_apple(app->findmy_main, app->apple);
furi_hal_bt_extra_beacon_set_data(app->state.data, sizeof(app->state.data)));
findmy_main_update_type(app->findmy_main, findmy_data_get_type(app->state.data));
break;
default:
break;

12
applications/system/findmy/scenes/findmy_scene_main.c
View File

@@ -25,20 +25,24 @@ bool findmy_scene_main_on_event(void* context, SceneManagerEvent event) {
findmy_toggle_beacon(app);
break;
case FindMyMainEventBackground:
furi_hal_bt_extra_beacon_start();
if(!furi_hal_bt_extra_beacon_is_active()) {
furi_check(furi_hal_bt_extra_beacon_start());
}
view_dispatcher_stop(app->view_dispatcher);
break;
case FindMyMainEventConfig:
scene_manager_next_scene(app->scene_manager, FindMySceneConfig);
break;
case FindMyMainEventIntervalUp:
findmy_change_broadcast_interval(app, app->broadcast_interval + 1);
findmy_change_broadcast_interval(app, app->state.broadcast_interval + 1);
break;
case FindMyMainEventIntervalDown:
findmy_change_broadcast_interval(app, app->broadcast_interval - 1);
findmy_change_broadcast_interval(app, app->state.broadcast_interval - 1);
break;
case FindMyMainEventQuit:
furi_hal_bt_extra_beacon_stop();
if(furi_hal_bt_extra_beacon_is_active()) {
furi_check(furi_hal_bt_extra_beacon_stop());
}
break;
default:
consumed = false;