[hardware_test] Get rid of the reset step

This commit is contained in:
Romain Goyet
2018-05-04 15:57:03 +02:00
committed by Ecco
parent 339ec330c1
commit aa776be032
6 changed files with 4 additions and 85 deletions

View File

@@ -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\
)

View File

@@ -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];
}

View File

@@ -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);

View File

@@ -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;
}
}

View File

@@ -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

View File

@@ -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;