From aa776be0327daedaaa8bf26239d01aa3fb797aab Mon Sep 17 00:00:00 2001
From: Romain Goyet <romain.goyet@numworks.com>
Date: Fri, 4 May 2018 15:57:03 +0200
Subject: [PATCH] [hardware_test] Get rid of the reset step

---
 apps/hardware_test/Makefile                   |  3 --
 apps/hardware_test/app.cpp                    |  8 ++--
 apps/hardware_test/app.h                      |  2 -
 apps/hardware_test/reset_controller.cpp       | 44 -------------------
 apps/hardware_test/reset_controller.h         | 30 -------------
 .../serial_number_controller.cpp              |  2 +-
 6 files changed, 4 insertions(+), 85 deletions(-)
 delete mode 100644 apps/hardware_test/reset_controller.cpp
 delete mode 100644 apps/hardware_test/reset_controller.h

diff --git a/apps/hardware_test/Makefile b/apps/hardware_test/Makefile
index 01a46c665..9dccad367 100644
--- a/apps/hardware_test/Makefile
+++ b/apps/hardware_test/Makefile
@@ -9,11 +9,8 @@ app_objs += $(addprefix apps/hardware_test/,\
   pattern.o\
   pattern_view.o\
   pop_up_controller.o\
-  reset_controller.o\
   screen_test_controller.o\
   screen_test_controller.o\
   serial_number_controller.o\
   usb_test_controller.o\
 )
-
-
diff --git a/apps/hardware_test/app.cpp b/apps/hardware_test/app.cpp
index a7ee45cd2..4852060f6 100644
--- a/apps/hardware_test/app.cpp
+++ b/apps/hardware_test/app.cpp
@@ -29,13 +29,12 @@ App::WizardViewController::WizardViewController(Responder * parentResponder) :
   m_ledTestController(this),
   m_batteryTestController(this),
   m_USBTestController(this),
-  m_serialNumberController(this),
-  m_resetController(this)
+  m_serialNumberController(this)
 {
 }
 
 int App::WizardViewController::numberOfChildren() {
-  return 7;
+  return 6;
 }
 
 ViewController * App::WizardViewController::childAtIndex(int i) {
@@ -45,8 +44,7 @@ ViewController * App::WizardViewController::childAtIndex(int i) {
     &m_ledTestController,
     &m_batteryTestController,
     &m_USBTestController,
-    &m_serialNumberController,
-    &m_resetController
+    &m_serialNumberController
   };
   return children[i];
 }
diff --git a/apps/hardware_test/app.h b/apps/hardware_test/app.h
index 355a97bb5..12e9b3dc2 100644
--- a/apps/hardware_test/app.h
+++ b/apps/hardware_test/app.h
@@ -8,7 +8,6 @@
 #include "battery_test_controller.h"
 #include "usb_test_controller.h"
 #include "serial_number_controller.h"
-#include "reset_controller.h"
 
 class AppsContainer;
 
@@ -35,7 +34,6 @@ private:
     BatteryTestController m_batteryTestController;
     USBTestController m_USBTestController;
     SerialNumberController m_serialNumberController;
-    ResetController m_resetController;
   };
 
   App(Container * container, Snapshot * snapshot);
diff --git a/apps/hardware_test/reset_controller.cpp b/apps/hardware_test/reset_controller.cpp
deleted file mode 100644
index 7822b9221..000000000
--- a/apps/hardware_test/reset_controller.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "reset_controller.h"
-extern "C" {
-#include <assert.h>
-}
-#include <poincare.h>
-
-using namespace Poincare;
-
-namespace HardwareTest {
-
-ResetController::ResetController(Responder * parentResponder) :
-  ViewController(parentResponder),
-  m_view()
-{
-}
-
-View * ResetController::view() {
-  return &m_view;
-}
-
-bool ResetController::handleEvent(Ion::Events::Event event) {
-  return true;
-}
-
-ResetController::ContentView::ContentView() :
-  m_resetTextView()
-{
-  m_resetTextView.setText("RESET");
-}
-
-void ResetController::ContentView::layoutSubviews() {
-  m_resetTextView.setFrame(bounds());
-}
-
-int ResetController::ContentView::numberOfSubviews() const {
-  return 1;
-}
-
-View * ResetController::ContentView::subviewAtIndex(int index) {
-  return &m_resetTextView;
-}
-
-}
-
diff --git a/apps/hardware_test/reset_controller.h b/apps/hardware_test/reset_controller.h
deleted file mode 100644
index 60f215801..000000000
--- a/apps/hardware_test/reset_controller.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef HARDWARE_TEST_RESET_CONTROLLER_H
-#define HARDWARE_TEST_RESET_CONTROLLER_H
-
-#include <escher.h>
-
-namespace HardwareTest {
-
-class ResetController : public ViewController {
-public:
-  ResetController(Responder * parentResponder);
-  View * view() override;
-  bool handleEvent(Ion::Events::Event event) override;
-private:
-  class ContentView : public View {
-  public:
-    ContentView();
-    BufferTextView * resetTextView();
-  private:
-    void layoutSubviews() override;
-    int numberOfSubviews() const override;
-    View * subviewAtIndex(int index) override;
-    BufferTextView m_resetTextView;
-  };
-  ContentView m_view;
-};
-
-}
-
-#endif
-
diff --git a/apps/hardware_test/serial_number_controller.cpp b/apps/hardware_test/serial_number_controller.cpp
index 42671fffb..c690517a9 100644
--- a/apps/hardware_test/serial_number_controller.cpp
+++ b/apps/hardware_test/serial_number_controller.cpp
@@ -16,7 +16,7 @@ void SerialNumberController::viewWillAppear() {
 }
 
 bool SerialNumberController::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::OnOff || event == Ion::Events::OK) {
+  if (event == Ion::Events::OnOff) {
     return false;
   }
   return true;