From 7d60b940d64904807977fb498db4d7dceb152566 Mon Sep 17 00:00:00 2001
From: Jared Boone <jboone@earfeast.com>
Date: Fri, 12 Feb 2016 15:05:47 -0800
Subject: [PATCH] Push hardware peripherals debug views into a sub-menu.

---
 firmware/application/ui_debug.cpp | 21 +++++++++++++++------
 firmware/application/ui_debug.hpp |  5 +++++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/firmware/application/ui_debug.cpp b/firmware/application/ui_debug.cpp
index 64b693df5..f35faeee5 100644
--- a/firmware/application/ui_debug.cpp
+++ b/firmware/application/ui_debug.cpp
@@ -242,13 +242,10 @@ void RegistersView::focus() {
 	button_done.focus();
 }
 
-/* DebugMenuView *********************************************************/
+/* DebugPeripheralsMenuView **********************************************/
 
-DebugMenuView::DebugMenuView(NavigationView& nav) {
-	add_items<8>({ {
-		{ "Memory",      [&nav](){ nav.push<DebugMemoryView>(); } },
-		{ "Radio State", [&nav](){ nav.push<NotImplementedView>(); } },
-		{ "SD Card",     [&nav](){ nav.push<NotImplementedView>(); } },
+DebugPeripheralsMenuView::DebugPeripheralsMenuView(NavigationView& nav) {
+	add_items<4>({ {
 		{ "RFFC5072",    [&nav](){ nav.push<RegistersView>(
 			"RFFC5072", RegistersWidgetConfig { 31, 2, 4, 4 },
 			[](const size_t register_number) { return radio::first_if.read(register_number); }
@@ -265,6 +262,18 @@ DebugMenuView::DebugMenuView(NavigationView& nav) {
 			"WM8731", RegistersWidgetConfig { audio::debug::reg_count(), 1, 3, 4 },
 			[](const size_t register_number) { return audio::debug::reg_read(register_number); }
 		); } },
+	} });
+	on_left = [&nav](){ nav.pop(); };
+}
+
+/* DebugMenuView *********************************************************/
+
+DebugMenuView::DebugMenuView(NavigationView& nav) {
+	add_items<8>({ {
+		{ "Memory",      [&nav](){ nav.push<DebugMemoryView>(); } },
+		{ "Radio State", [&nav](){ nav.push<NotImplementedView>(); } },
+		{ "SD Card",     [&nav](){ nav.push<NotImplementedView>(); } },
+		{ "Peripherals", [&nav](){ nav.push<DebugPeripheralsMenuView>(); } },
 		{ "Temperature", [&nav](){ nav.push<TemperatureView>(); } },
 	} });
 	on_left = [&nav](){ nav.pop(); };
diff --git a/firmware/application/ui_debug.hpp b/firmware/application/ui_debug.hpp
index 1406b90ee..779461cc7 100644
--- a/firmware/application/ui_debug.hpp
+++ b/firmware/application/ui_debug.hpp
@@ -208,6 +208,11 @@ private:
 	};
 };
 
+class DebugPeripheralsMenuView : public MenuView {
+public:
+	DebugPeripheralsMenuView(NavigationView& nav);
+};
+
 class DebugMenuView : public MenuView {
 public:
 	DebugMenuView(NavigationView& nav);