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

FindMy: Fix battery level edge cases (eg. at boot) and cleanup

Browse Source 
- Generate config struct only when necessary
- Centralize last few things to use state values
- Uniform state apply and save process
- Simplify battery level handling
This commit is contained in:
Willy-JL
2024-05-02 06:46:06 +01:00
parent f3c1c09e39
commit ff2bb16492
9 changed files with 61 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,4 @@
#include "findmy_i.h"
#include <furi_hal_power.h>
static bool findmy_custom_event_callback(void* context, uint32_t event) {
furi_assert(context);
@@ -52,7 +51,7 @@ static FindMy* findmy_app_alloc() {
findmy_state_load(&app->state);
findmy_state_apply(&app->state);
findmy_main_update_active(app->findmy_main, furi_hal_bt_extra_beacon_is_active());
findmy_main_update_active(app->findmy_main, app->state.beacon_active);
findmy_main_update_interval(app->findmy_main, app->state.broadcast_interval);
findmy_main_toggle_mac(app->findmy_main, app->state.show_mac);
findmy_main_update_mac(app->findmy_main, app->state.mac);
@@ -104,7 +103,7 @@ void findmy_change_broadcast_interval(FindMy* app, uint8_t value) {
}
app->state.broadcast_interval = value;
findmy_main_update_interval(app->findmy_main, app->state.broadcast_interval);
findmy_state_save_and_apply(app, &app->state);
findmy_state_save_and_apply(&app->state);
}
void findmy_change_transmit_power(FindMy* app, uint8_t value) {
@@ -112,57 +111,27 @@ void findmy_change_transmit_power(FindMy* app, uint8_t value) {
return;
}
app->state.transmit_power = value;
findmy_state_save_and_apply(app, &app->state);
findmy_state_save_and_apply(&app->state);
}
void findmy_toggle_show_mac(FindMy* app, bool show_mac) {
app->state.show_mac = show_mac;
findmy_main_toggle_mac(app->findmy_main, app->state.show_mac);
findmy_state_save_and_apply(app, &app->state);
findmy_state_save_and_apply(&app->state);
}
void findmy_toggle_beacon(FindMy* app) {
app->state.beacon_active = !app->state.beacon_active;
findmy_state_save_and_apply(app, &app->state);
findmy_main_update_active(app->findmy_main, furi_hal_bt_extra_beacon_is_active());
findmy_state_save_and_apply(&app->state);
findmy_main_update_active(app->findmy_main, app->state.beacon_active);
}
void findmy_set_tag_type(FindMy* app, FindMyType type) {
app->state.tag_type = type;
findmy_state_save_and_apply(app, &app->state);
findmy_state_save_and_apply(&app->state);
findmy_main_update_type(app->findmy_main, type);
}
void findmy_state_save_and_apply(FindMy* app, FindMyState* state) {
uint32_t battery_capacity = furi_hal_power_get_battery_full_capacity();
uint32_t battery_remaining = furi_hal_power_get_battery_remaining_capacity();
uint16_t battery_percent = (battery_remaining * 100) / battery_capacity;
uint8_t battery_level;
if(battery_percent > 80) {
battery_level = BATTERY_FULL;
} else if(battery_percent > 50) {
battery_level = BATTERY_MEDIUM;
} else if(battery_percent > 20) {
battery_level = BATTERY_LOW;
} else {
battery_level = BATTERY_CRITICAL;
}
app->state.battery_level = battery_level;
if(furi_hal_bt_extra_beacon_is_active()) {
furi_check(furi_hal_bt_extra_beacon_stop());
}
furi_check(
furi_hal_bt_extra_beacon_set_data(state->data, findmy_state_data_size(state->tag_type)));
findmy_state_sync_config(state);
findmy_state_save(state);
furi_check(furi_hal_bt_extra_beacon_set_config(&state->config));
if(state->beacon_active) {
furi_check(furi_hal_bt_extra_beacon_start());
}
}
void furi_hal_bt_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++) {