From 0025ad250718f0195340ee1acfddf460da812675 Mon Sep 17 00:00:00 2001
From: jLynx <admin@jlynx.net>
Date: Thu, 24 Mar 2022 19:19:02 +1300
Subject: [PATCH] refactoring

---
 firmware/application/apps/tpms_app.cpp | 42 +++++++++++---------------
 firmware/application/apps/tpms_app.hpp |  4 +--
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/firmware/application/apps/tpms_app.cpp b/firmware/application/apps/tpms_app.cpp
index 4362247e..d260d9b4 100644
--- a/firmware/application/apps/tpms_app.cpp
+++ b/firmware/application/apps/tpms_app.cpp
@@ -149,15 +149,8 @@ TPMSAppView::TPMSAppView(NavigationView&) {
 		&field_lna,
 		&field_vga,
 		&options_type,
-		// &recent_entries_view,
-		// &recent_entries_view_psi,
 	});
 
-	// remove_children({
-	// 	&recent_entries_view,
-	// 	// &recent_entries_view_psi,
-	// });
-
 	radio::enable({
 		tuning_frequency(),
 		sampling_rate,
@@ -173,19 +166,6 @@ TPMSAppView::TPMSAppView(NavigationView&) {
 	};
 	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);
-		}
-		if(i == 1){
-			tpms::format::use_kpa = false;
-			remove_child(&recent_entries_view);
-			add_child(&recent_entries_view_psi);
-		}	
-	};
-
 	options_type.set_selected_index(0, true);
 
 	logger = std::make_unique<TPMSLogger>();
@@ -206,7 +186,21 @@ void TPMSAppView::focus() {
 
 void TPMSAppView::set_parent_rect(const Rect new_parent_rect) {
 	View::set_parent_rect(new_parent_rect);
-	recent_entries_view.set_parent_rect({ 0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height });
+
+	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);
+		}
+		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 });
 	recent_entries_view_psi.set_parent_rect({ 0, header_height, new_parent_rect.width(), new_parent_rect.height() - header_height });
 }
 
@@ -222,7 +216,7 @@ void TPMSAppView::on_packet(const tpms::Packet& packet) {
 		entry.update(reading);
 		
 		if(tpms::format::use_kpa){
-			recent_entries_view.set_dirty();
+			recent_entries_view_kpa.set_dirty();
 		} else {
 			recent_entries_view_psi.set_dirty();
 		}
@@ -231,8 +225,8 @@ void TPMSAppView::on_packet(const tpms::Packet& packet) {
 
 void TPMSAppView::on_show_list() {
 	if(tpms::format::use_kpa){
-		recent_entries_view.hidden(false);
-		recent_entries_view.focus();
+		recent_entries_view_kpa.hidden(false);
+		recent_entries_view_kpa.focus();
 	} else {
 		recent_entries_view_psi.hidden(false);
 		recent_entries_view_psi.focus();
diff --git a/firmware/application/apps/tpms_app.hpp b/firmware/application/apps/tpms_app.hpp
index 55e70914..44b4b15d 100644
--- a/firmware/application/apps/tpms_app.hpp
+++ b/firmware/application/apps/tpms_app.hpp
@@ -162,7 +162,7 @@ private:
 	TPMSRecentEntries recent { };
 	std::unique_ptr<TPMSLogger> logger { };
 
-	const RecentEntriesColumns columns { {
+	const RecentEntriesColumns columns_kpa { {
 		{ "Tp", 2 },
 		{ "ID", 8 },
 		{ "kPa", 3 },
@@ -170,7 +170,7 @@ private:
 		{ "Cnt", 3 },
 		{ "Fl", 2 },
 	} };
-	TPMSRecentEntriesView recent_entries_view { columns, recent };
+	TPMSRecentEntriesView recent_entries_view_kpa { columns_kpa, recent };
 
 	const RecentEntriesColumns columns_psi { {
 		{ "Tp", 2 },