Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-12-24 23:09:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
jLynx 2022-03-24 19:43:26 +13:00
parent 0025ad2507
commit d1d1198b1b
2 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
firmware/application/apps/tpms_app.cpp
View File

@ -166,6 +166,22 @@ TPMSAppView::TPMSAppView(NavigationView&) {
}; };
options_band.set_by_value(target_frequency()); options_band.set_by_value(target_frequency());
options_type.on_change = [this](size_t, int32_t i) {
if (i == 0){
tpms::format::use_kpa = true;
// remove_child(&recent_entries_view_psi);
// add_child(&recent_entries_view_kpa);
// recent_entries_view_kpa.set_parent_rect(view_normal_rect);
}
if(i == 1){
tpms::format::use_kpa = false;
// remove_child(&recent_entries_view_kpa);
// add_child(&recent_entries_view_psi);
// recent_entries_view_psi.set_parent_rect(view_normal_rect);
}
update_type();
};
options_type.set_selected_index(0, true); options_type.set_selected_index(0, true);
logger = std::make_unique<TPMSLogger>(); logger = std::make_unique<TPMSLogger>();
@ -184,24 +200,24 @@ void TPMSAppView::focus() {
options_band.focus(); options_band.focus();
} }
void TPMSAppView::update_type() {
if (tpms::format::use_kpa){
remove_child(&recent_entries_view_psi);
add_child(&recent_entries_view_kpa);
recent_entries_view_kpa.set_parent_rect(view_normal_rect);
} else {
remove_child(&recent_entries_view_kpa);
add_child(&recent_entries_view_psi);
recent_entries_view_psi.set_parent_rect(view_normal_rect);
}
}
void TPMSAppView::set_parent_rect(const Rect new_parent_rect) { void TPMSAppView::set_parent_rect(const Rect new_parent_rect) {
View::set_parent_rect(new_parent_rect); View::set_parent_rect(new_parent_rect);
options_type.on_change = [this](size_t, int32_t i) { view_normal_rect = { 0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height };
if (i == 0){
tpms::format::use_kpa = true;
remove_child(&recent_entries_view_psi);
add_child(&recent_entries_view_kpa);
}
if(i == 1){
tpms::format::use_kpa = false;
remove_child(&recent_entries_view_kpa);
add_child(&recent_entries_view_psi);
}
};
recent_entries_view_kpa.set_parent_rect({ 0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height }); update_type();
recent_entries_view_psi.set_parent_rect({ 0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height });
} }
void TPMSAppView::on_packet(const tpms::Packet& packet) { void TPMSAppView::on_packet(const tpms::Packet& packet) {

3
firmware/application/apps/tpms_app.hpp
View File

@ -121,6 +121,8 @@ private:
static constexpr ui::Dim header_height = 1 * 16; static constexpr ui::Dim header_height = 1 * 16;
ui::Rect view_normal_rect { };
RSSI rssi { RSSI rssi {
{ 21 * 8, 0, 6 * 8, 4 }, { 21 * 8, 0, 6 * 8, 4 },
}; };
@ -186,6 +188,7 @@ private:
void on_packet(const tpms::Packet& packet); void on_packet(const tpms::Packet& packet);
void on_show_list(); void on_show_list();
void update_type();
void on_band_changed(const uint32_t new_band_frequency); void on_band_changed(const uint32_t new_band_frequency);