mount/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-2254] IR: fix hardfault, correct remote loading (#999)

Browse Source 
* Bugfix: remove freeing of uninitialized object (IrdaAppSignal).
Therefore rubbish in memory sometimes caused HardFault.
* Fix: slow FFF makes IR-remotes loading take much time,
so we can glimpse previous scene's view while remote is parsing.
Reproducing: remove remote, fast press back (while popup is playing)
and select new remote - previous popup view is displayed.
This commit is contained in:
Albert Kharisov 2022-02-16 20:09:43 +04:00 committed by GitHub
parent 97c9a2229f
commit 17d6b9f612
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
applications/gui/modules/button_menu.c
View File

@ -99,8 +99,6 @@ static void button_menu_view_draw_callback(Canvas* canvas, void* _model) {
furi_assert(_model); furi_assert(_model);
ButtonMenuModel* model = (ButtonMenuModel*)_model; ButtonMenuModel* model = (ButtonMenuModel*)_model;
canvas_clear(canvas);
canvas_set_font(canvas, FontSecondary); canvas_set_font(canvas, FontSecondary);
uint8_t item_position = 0; uint8_t item_position = 0;
@ -117,11 +115,14 @@ static void button_menu_view_draw_callback(Canvas* canvas, void* _model) {
canvas_draw_icon(canvas, 28, 123, &I_IrdaArrowDown_4x8); canvas_draw_icon(canvas, 28, 123, &I_IrdaArrowDown_4x8);
} }
string_t disp_str; if(model->header) {
string_init_set_str(disp_str, model->header); string_t disp_str;
elements_string_fit_width(canvas, disp_str, ITEM_WIDTH - 6); string_init_set_str(disp_str, model->header);
canvas_draw_str_aligned(canvas, 32, 10, AlignCenter, AlignCenter, string_get_cstr(disp_str)); elements_string_fit_width(canvas, disp_str, ITEM_WIDTH - 6);
string_clear(disp_str); canvas_draw_str_aligned(
canvas, 32, 10, AlignCenter, AlignCenter, string_get_cstr(disp_str));
string_clear(disp_str);
}
for(ButtonMenuItemArray_it(it, model->items); !ButtonMenuItemArray_end_p(it); for(ButtonMenuItemArray_it(it, model->items); !ButtonMenuItemArray_end_p(it);
ButtonMenuItemArray_next(it), ++item_position) { ButtonMenuItemArray_next(it), ++item_position) {
@ -248,6 +249,7 @@ void button_menu_reset(ButtonMenu* button_menu) {
button_menu->view, (ButtonMenuModel * model) { button_menu->view, (ButtonMenuModel * model) {
ButtonMenuItemArray_reset(model->items); ButtonMenuItemArray_reset(model->items);
model->position = 0; model->position = 0;
model->header = NULL;
return true; return true;
}); });
} }

3
applications/irda/irda_app_remote_manager.cpp
View File

@ -110,10 +110,11 @@ std::string IrdaAppRemoteManager::get_button_name(uint32_t index) {
} }
std::string IrdaAppRemoteManager::get_remote_name() { std::string IrdaAppRemoteManager::get_remote_name() {
return remote ? remote->name : std::string(); return remote.get() ? remote->name : std::string();
} }
int IrdaAppRemoteManager::find_remote_name(const std::vector<std::string>& strings) { int IrdaAppRemoteManager::find_remote_name(const std::vector<std::string>& strings) {
furi_assert(remote.get() != nullptr);
int i = 0; int i = 0;
for(const auto& str : strings) { for(const auto& str : strings) {
if(!str.compare(remote->name)) { if(!str.compare(remote->name)) {

2
applications/irda/irda_app_signal.cpp
View File

@ -70,8 +70,6 @@ IrdaAppSignal::IrdaAppSignal(const IrdaAppSignal& other) {
} }
IrdaAppSignal::IrdaAppSignal(IrdaAppSignal&& other) { IrdaAppSignal::IrdaAppSignal(IrdaAppSignal&& other) {
clear_timings();
raw_signal = other.raw_signal; raw_signal = other.raw_signal;
if(!raw_signal) { if(!raw_signal) {
payload.message = other.payload.message; payload.message = other.payload.message;

5
applications/irda/scene/irda_app_scene_remote_list.cpp
View File

@ -15,6 +15,11 @@ void IrdaAppSceneRemoteList::on_enter(IrdaApp* app) {
last_selected_remote.size() ? last_selected_remote.c_str() : nullptr; last_selected_remote.size() ? last_selected_remote.c_str() : nullptr;
auto filename_ts = std::make_unique<TextStore>(IrdaAppRemoteManager::max_remote_name_length); auto filename_ts = std::make_unique<TextStore>(IrdaAppRemoteManager::max_remote_name_length);
IrdaAppViewManager* view_manager = app->get_view_manager();
ButtonMenu* button_menu = view_manager->get_button_menu();
button_menu_reset(button_menu);
view_manager->switch_to(IrdaAppViewManager::ViewType::ButtonMenu);
file_select_result = file_worker.file_select( file_select_result = file_worker.file_select(
IrdaApp::irda_directory, IrdaApp::irda_directory,
IrdaApp::irda_extension, IrdaApp::irda_extension,