diff --git a/firmware/application/ui_navigation.cpp b/firmware/application/ui_navigation.cpp index d6a355216..440b7686c 100644 --- a/firmware/application/ui_navigation.cpp +++ b/firmware/application/ui_navigation.cpp @@ -147,8 +147,10 @@ void NavigationView::free_view() { void NavigationView::update_view() { const auto new_view = view_stack.back().get(); + add_child(new_view); new_view->set_parent_rect({ {0, 0}, size() }); + focus(); set_dirty(); diff --git a/firmware/common/portapack_persistent_memory.cpp b/firmware/common/portapack_persistent_memory.cpp index 8ee50f420..daa5ea85d 100644 --- a/firmware/common/portapack_persistent_memory.cpp +++ b/firmware/common/portapack_persistent_memory.cpp @@ -22,7 +22,6 @@ #include "portapack_persistent_memory.hpp" #include "portapack.hpp" - #include "hal.h" #include "utility.hpp" diff --git a/firmware/common/ui_widget.cpp b/firmware/common/ui_widget.cpp index 88d5cc165..94af1dc02 100644 --- a/firmware/common/ui_widget.cpp +++ b/firmware/common/ui_widget.cpp @@ -329,7 +329,7 @@ void Text::paint(Painter& painter) { /* Button ****************************************************************/ - Button::Button( +Button::Button( Rect parent_rect, std::string text ) : Widget { parent_rect }, diff --git a/firmware/tools/extract_svf_data_xc2c64a.py b/firmware/tools/extract_svf_data_xc2c64a.py index 8ec3afd54..a82ca5382 100755 --- a/firmware/tools/extract_svf_data_xc2c64a.py +++ b/firmware/tools/extract_svf_data_xc2c64a.py @@ -340,3 +340,4 @@ type_name = '::cpld::xilinx::XC2C64A::verify_blocks_t' # HeaderGen(header_includes, namespaces, type_name, variable_name).to_file(args.header_file_path) DataGen(data_includes, namespaces, type_name, variable_name, verify).to_file(args.data_file_path) +